diff --git a/roles/matrix-postgres/tasks/setup_postgres.yml b/roles/matrix-postgres/tasks/setup_postgres.yml
index 6a0f98548..518d1a5f0 100644
--- a/roles/matrix-postgres/tasks/setup_postgres.yml
+++ b/roles/matrix-postgres/tasks/setup_postgres.yml
@@ -118,7 +118,7 @@
     apply:
       tags:
         - always
-  when: "matrix_postgres_enabled|bool"
+  when: "matrix_postgres_enabled|bool and matrix_postgres_additional_databases|length > 0"
 
 #
 # Tasks related to getting rid of the internal postgres server (if it was previously enabled)