diff --git a/roles/matrix-postgres/tasks/import_postgres.yml b/roles/matrix-postgres/tasks/import_postgres.yml
index 302a8f411..107a1f887 100644
--- a/roles/matrix-postgres/tasks/import_postgres.yml
+++ b/roles/matrix-postgres/tasks/import_postgres.yml
@@ -49,8 +49,10 @@
     name: matrix-postgres
     state: started
     daemon_reload: true
+  register: matrix_postgres_import_start_result
 
-- name: Wait a bit, so that Postgres can start
+- when: matrix_postgres_import_start_result.changed | bool
+  name: Wait a bit, so that Postgres can start
   ansible.builtin.wait_for:
     timeout: "{{ postgres_start_wait_time }}"
   delegate_to: 127.0.0.1
diff --git a/roles/matrix-postgres/tasks/run_vacuum.yml b/roles/matrix-postgres/tasks/run_vacuum.yml
index 9801ab2c7..1b769f01f 100644
--- a/roles/matrix-postgres/tasks/run_vacuum.yml
+++ b/roles/matrix-postgres/tasks/run_vacuum.yml
@@ -28,8 +28,10 @@
     name: matrix-postgres
     state: started
     daemon_reload: true
+  register: matrix_postgres_vacuum_start_result
 
-- name: Wait a bit, so that Postgres can start
+- when: matrix_postgres_vacuum_start_result.changed | bool
+  name: Wait a bit, so that Postgres can start
   ansible.builtin.wait_for:
     timeout: "{{ postgres_start_wait_time }}"
   delegate_to: 127.0.0.1