diff --git a/roles/matrix-synapse/tasks/update_user_password.yml b/roles/matrix-synapse/tasks/update_user_password.yml
index 5d63f8cba..b01870049 100644
--- a/roles/matrix-synapse/tasks/update_user_password.yml
+++ b/roles/matrix-synapse/tasks/update_user_password.yml
@@ -33,12 +33,7 @@
 - name: Wait a while, so that Matrix Synapse can manage to start
   pause:
     seconds: 7
-  when: "start_result.changed"
-
-- name: Wait a while, so that Matrix Postgres can manage to start
-  pause:
-    seconds: 7
-  when: "postgres_start_result.changed"
+  when: "start_result.changed" or "postgres_start_result.changed"
 
 - name: Generate password hash
   shell: "/usr/bin/docker exec matrix-synapse /usr/local/bin/hash_password -c /data/homeserver.yaml -p {{ password }}"