diff --git a/group_vars/matrix_servers b/group_vars/matrix_servers
index 8db2a7298..6da20c467 100755
--- a/group_vars/matrix_servers
+++ b/group_vars/matrix_servers
@@ -5864,7 +5864,7 @@ matrix_user_creator_users_auto: |
       'username': matrix_bot_draupnir_login,
       'initial_password': matrix_bot_draupnir_password,
       'initial_type': 'bot',
-    }] if matrix_bot_draupnir_enabled else [])
+    }] if matrix_bot_draupnir_enabled and matrix_bot_draupnir_password else [])
   }}
 
 ######################################################################