diff --git a/roles/matrix-postgres/tasks/import_postgres.yml b/roles/matrix-postgres/tasks/import_postgres.yml
index aed8f686b..66b20a64a 100644
--- a/roles/matrix-postgres/tasks/import_postgres.yml
+++ b/roles/matrix-postgres/tasks/import_postgres.yml
@@ -30,6 +30,11 @@
     postgres_start_wait_time: 15
   when: "postgres_start_wait_time|default('') == ''"
 
+- name: Set postgres_import_wait_time, if not provided
+  set_fact:
+    postgres_import_wait_time: "{{ 7 * 86400 }}"
+  when: "postgres_import_wait_time|default('') == ''"
+
 # Actual import work
 
 - name: Ensure matrix-postgres is started
@@ -74,3 +79,5 @@
 
 - name: Perform Postgres database import
   command: "{{ matrix_postgres_import_command }}"
+  async: "{{ postgres_import_wait_time }}"
+  poll: 10