diff --git a/application/clicommands/ConfigCommand.php b/application/clicommands/ConfigCommand.php
index dbf92a62..e140536b 100644
--- a/application/clicommands/ConfigCommand.php
+++ b/application/clicommands/ConfigCommand.php
@@ -132,6 +132,7 @@ class ConfigCommand extends Command
             printf("Config '%s' has been deployed\n", $checksum);
         } else {
             echo $deployer->getNoDeploymentReason() . "\n";
+            return;
         }
 
         if ($timeout = $this->getWaitTime()) {
diff --git a/doc/82-Changelog.md b/doc/82-Changelog.md
index 8b8ef042..35b244a4 100644
--- a/doc/82-Changelog.md
+++ b/doc/82-Changelog.md
@@ -11,6 +11,9 @@ v1.10.0 (unreleased)
 * You can find issues and feature requests related to this release on our
   [roadmap](https://github.com/Icinga/icingaweb2-module-director/milestone/27?closed=1)
 
+### CLI
+* FIX: config deploy doesn't try to wait in case of no deployment (#2522)
+
 1.9.1
 -----