diff --git a/src/fenrir-package/core/commandManager.py b/src/fenrir-package/core/commandManager.py
index 5892701c..40d4b083 100644
--- a/src/fenrir-package/core/commandManager.py
+++ b/src/fenrir-package/core/commandManager.py
@@ -46,7 +46,7 @@ class commandManager():
         for command in sorted(environment['commands'][section]):
             try:
                 environment['commands'][section][command].shutdown(environment)
-                environment['commands'][section][command] = None
+                del environment['commands'][section][command]
             except Exception as e:
                 print(e)
                 environment['runtime']['debug'].writeDebugOut(environment,"Shutdown command:" + section + "." + cmd ,debug.debugLevel.ERROR)