diff --git a/src/plugins/PluginAPI.cpp b/src/plugins/PluginAPI.cpp
index 1d6586aa..2abddc90 100644
--- a/src/plugins/PluginAPI.cpp
+++ b/src/plugins/PluginAPI.cpp
@@ -407,7 +407,7 @@ APICALL bool HyprlandAPI::unregisterHyprCtlCommand(HANDLE handle, SP<SHyprCtlCom
     if (!PLUGIN)
         return false;
 
-    std::erase(PLUGIN->m_registeredHyprctlCommands, cmd);
+    std::erase_if(PLUGIN->m_registeredHyprctlCommands, [&](const auto& other) { return !other || other == cmd; });
     g_pHyprCtl->unregisterCommand(cmd);
 
     return true;
diff --git a/src/plugins/PluginSystem.cpp b/src/plugins/PluginSystem.cpp
index 53b05bc8..0549c81b 100644
--- a/src/plugins/PluginSystem.cpp
+++ b/src/plugins/PluginSystem.cpp
@@ -171,8 +171,10 @@ void CPluginSystem::unloadPlugin(const CPlugin* plugin, bool eject) {
         HyprlandAPI::removeDispatcher(plugin->m_handle, d);
 
     const auto rhc = plugin->m_registeredHyprctlCommands;
-    for (auto const& c : rhc)
-        HyprlandAPI::unregisterHyprCtlCommand(plugin->m_handle, c);
+    for (auto const& c : rhc) {
+        if (const auto sp = c.lock())
+            HyprlandAPI::unregisterHyprCtlCommand(plugin->m_handle, sp);
+    }
 
     g_pConfigManager->removePluginConfig(plugin->m_handle);
 
diff --git a/src/plugins/PluginSystem.hpp b/src/plugins/PluginSystem.hpp
index ed421960..286f10d5 100644
--- a/src/plugins/PluginSystem.hpp
+++ b/src/plugins/PluginSystem.hpp
@@ -27,7 +27,7 @@ class CPlugin {
     std::vector<IHyprWindowDecoration*>                       m_registeredDecorations;
     std::vector<std::pair<std::string, WP<HOOK_CALLBACK_FN>>> m_registeredCallbacks;
     std::vector<std::string>                                  m_registeredDispatchers;
-    std::vector<SP<SHyprCtlCommand>>                          m_registeredHyprctlCommands;
+    std::vector<WP<SHyprCtlCommand>>                          m_registeredHyprctlCommands;
 };
 
 class CPluginSystem {