diff --git a/tasks/main.yml b/tasks/main.yml
index dcb4eea7..b735501e 100644
--- a/tasks/main.yml
+++ b/tasks/main.yml
@@ -142,7 +142,8 @@
 
 - include_tasks: keystone_ldap_setup.yml
   when:
-    - "keystone_service_setup | bool"
+    - keystone_service_setup | bool
+    - keystone_ldap != {}
   tags:
     - keystone-config