diff --git a/roles/matrix-postgres/tasks/import_postgres.yml b/roles/matrix-postgres/tasks/import_postgres.yml
index 53d67436b..965719e46 100644
--- a/roles/matrix-postgres/tasks/import_postgres.yml
+++ b/roles/matrix-postgres/tasks/import_postgres.yml
@@ -108,4 +108,5 @@
   async: "{{ postgres_import_wait_time }}"
   poll: 10
   register: matrix_postgres_import_postgres_command_result
-  changed_when: matrix_postgres_import_postgres_command_result.rc == 0
+  failed_when: not matrix_postgres_import_postgres_command_result.async_result.finished
+  changed_when: matrix_postgres_import_postgres_command_result.async_result.finished and matrix_postgres_import_postgres_command_result.rc == 0
diff --git a/roles/matrix-postgres/tasks/run_vacuum.yml b/roles/matrix-postgres/tasks/run_vacuum.yml
index ce2bee6b9..efe69a832 100644
--- a/roles/matrix-postgres/tasks/run_vacuum.yml
+++ b/roles/matrix-postgres/tasks/run_vacuum.yml
@@ -78,7 +78,8 @@
   async: "{{ postgres_vacuum_wait_time }}"
   poll: 10
   register: matrix_postgres_synapse_vacuum_result
-  changed_when: matrix_postgres_synapse_vacuum_result.rc == 0
+  failed_when: not matrix_postgres_synapse_vacuum_result.async_result.finished
+  changed_when: matrix_postgres_synapse_vacuum_result.async_result.finished and matrix_postgres_synapse_vacuum_result.rc == 0
 
 # Intentionally show the results
 - ansible.builtin.debug: var="matrix_postgres_synapse_vacuum_result"
diff --git a/roles/matrix-synapse/tasks/rust-synapse-compress-state/compress_room.yml b/roles/matrix-synapse/tasks/rust-synapse-compress-state/compress_room.yml
index 221a75700..ff42cbc4c 100644
--- a/roles/matrix-synapse/tasks/rust-synapse-compress-state/compress_room.yml
+++ b/roles/matrix-synapse/tasks/rust-synapse-compress-state/compress_room.yml
@@ -21,7 +21,8 @@
   async: "{{ matrix_synapse_rust_synapse_compress_state_compress_room_time }}"
   poll: 10
   register: matrix_synapse_rust_synapse_compress_state_compress_room_command_result
-  changed_when: matrix_synapse_rust_synapse_compress_state_compress_room_command_result.rc == 0
+  failed_when: not matrix_synapse_rust_synapse_compress_state_compress_room_command_result.async_result.finished
+  changed_when: matrix_synapse_rust_synapse_compress_state_compress_room_command_result.async_result.finished and matrix_synapse_rust_synapse_compress_state_compress_room_command_result.rc == 0
 
 - ansible.builtin.debug: var="matrix_synapse_rust_synapse_compress_state_compress_room_command_result"
 
@@ -44,7 +45,8 @@
   async: "{{ matrix_synapse_rust_synapse_compress_state_psql_import_time }}"
   poll: 10
   register: matrix_synapse_rust_synapse_compress_state_psql_import_command_result
-  changed_when: matrix_synapse_rust_synapse_compress_state_psql_import_command_result.rc == 0
+  failed_when: not matrix_synapse_rust_synapse_compress_state_psql_import_command_result.async_result.finished
+  changed_when: matrix_synapse_rust_synapse_compress_state_psql_import_command_result.async_result.finished and matrix_synapse_rust_synapse_compress_state_psql_import_command_result.rc == 0
 
 - name: Clean up
   ansible.builtin.file:
diff --git a/roles/matrix-synapse/tasks/rust-synapse-compress-state/main.yml b/roles/matrix-synapse/tasks/rust-synapse-compress-state/main.yml
index fab0af55a..dcf9eed9d 100644
--- a/roles/matrix-synapse/tasks/rust-synapse-compress-state/main.yml
+++ b/roles/matrix-synapse/tasks/rust-synapse-compress-state/main.yml
@@ -70,6 +70,7 @@
   async: "{{ matrix_synapse_rust_synapse_compress_state_find_rooms_command_wait_time }}"
   poll: 10
   register: matrix_synapse_rust_synapse_compress_state_find_rooms_command_result
+  failed_when: not matrix_synapse_rust_synapse_compress_state_find_rooms_command_result.async_result.finished
   changed_when: false
 
 # We expect the output to be like this: