diff --git a/source/Command.cpp b/source/Command.cpp
index 805fc964..c93bfdf5 100644
--- a/source/Command.cpp
+++ b/source/Command.cpp
@@ -259,6 +259,8 @@ void CmdManager::Deinitialize()
     }
     // Clear the command list and release all references
     m_Commands.clear();
+	// Release the current context if any
+	m_Context.Reset();
     // Release the global callbacks
     m_OnFail.ReleaseGently();
     m_OnAuth.ReleaseGently();