diff --git a/roles/sap_ha_pacemaker_cluster/tasks/import_hacluster_vars_from_inventory.yml b/roles/sap_ha_pacemaker_cluster/tasks/import_hacluster_vars_from_inventory.yml
index b3c5ad290..ad449ce7b 100644
--- a/roles/sap_ha_pacemaker_cluster/tasks/import_hacluster_vars_from_inventory.yml
+++ b/roles/sap_ha_pacemaker_cluster/tasks/import_hacluster_vars_from_inventory.yml
@@ -63,7 +63,9 @@
 
 # ha_cluster_hacluster_password
 - name: "SAP HA Prepare Pacemaker - (ha_cluster) Register parameter 'ha_cluster_repos'"
-  when: ha_cluster_hacluster_password is defined
+  when:
+    - ha_cluster_hacluster_password is defined
+    - ha_cluster_hacluster_password | length > 0
   ansible.builtin.set_fact:
     __sap_ha_pacemaker_cluster_hacluster_user_password: "{{ ha_cluster_hacluster_password }}"
   no_log: true  # handle credentials with care