diff --git a/bmedll/ConCommandManager.cpp b/bmedll/ConCommandManager.cpp
index 2844fee..dc64c1c 100644
--- a/bmedll/ConCommandManager.cpp
+++ b/bmedll/ConCommandManager.cpp
@@ -75,7 +75,9 @@ void ConCommandManager::UnregisterAllCommands()
 ConCommandManager::~ConCommandManager()
 {
     SPDLOG_LOGGER_DEBUG(m_logger, "ConCommandManager destructor");
-    //if (!g_isShuttingDown)
+    // Note: ConVar/ConCommand unregistration doesn't work properly, they still appear in FactoryInternalIterator
+    // and can cause crashes on shutdown
+    if (!g_isShuttingDown)
         UnregisterAllCommands();
 }