diff --git a/tripleoclient/workflows/deployment.py b/tripleoclient/workflows/deployment.py
index 669825fb7..3c2d68d94 100644
--- a/tripleoclient/workflows/deployment.py
+++ b/tripleoclient/workflows/deployment.py
@@ -395,17 +395,15 @@ def config_download(log, clients, stack, ssh_network=None,
         logger=log,
         print_msg=(verbosity == 0)
     )
-    blacklist_show = stack.output_show('BlacklistedHostnames')
-    blacklist_stack_output = blacklist_show.get('output', dict())
-    blacklist_stack_output_value = blacklist_stack_output.get('output_value')
-    if blacklist_stack_output_value:
-
-        if not limit_hosts:
-            limit_hosts = ""
-
-        limit_hosts += (
-            ':'.join(['!{}'.format(i) for i in blacklist_stack_output_value
-                      if i]))
+    if not limit_hosts:
+        blacklist_show = stack.output_show('BlacklistedHostnames')
+        blacklist_stack_output = blacklist_show.get('output', dict())
+        blacklist_stack_output_value = blacklist_stack_output.get(
+            'output_value')
+        if blacklist_stack_output_value:
+            limit_hosts = (
+                ':'.join(['!{}'.format(i) for i in blacklist_stack_output_value
+                          if i]))
 
     _log_and_print(
         message='Retrieving configuration for stack: {}'.format(