diff --git a/application/clicommands/ModuleCommand.php b/application/clicommands/ModuleCommand.php
index 9b8e3240a..8cc470dad 100644
--- a/application/clicommands/ModuleCommand.php
+++ b/application/clicommands/ModuleCommand.php
@@ -3,6 +3,8 @@
 
 namespace Icinga\Clicommands;
 
+use Icinga\Application\Logger;
+use Icinga\Application\Modules\Manager;
 use Icinga\Cli\Command;
 
 /**
@@ -14,6 +16,9 @@ use Icinga\Cli\Command;
  */
 class ModuleCommand extends Command
 {
+    /**
+     * @var Manager
+     */
     protected $modules;
 
     public function init()
@@ -109,7 +114,12 @@ class ModuleCommand extends Command
         if (! $module || $this->hasRemainingParams()) {
             return $this->showUsage();
         }
-        $this->modules->disableModule($module);
+
+        if ($this->modules->hasEnabled($module)) {
+            $this->modules->disableModule($module);
+        } else {
+            Logger::info('Module "%s" is already disabled', $module);
+        }
     }
 
     /**