diff --git a/roles/matrix-base/defaults/main.yml b/roles/matrix-base/defaults/main.yml
index ab38084b8..544d8b0c1 100644
--- a/roles/matrix-base/defaults/main.yml
+++ b/roles/matrix-base/defaults/main.yml
@@ -47,6 +47,7 @@ run_setup: true
 run_import_postgres: true
 run_upgrade_postgres: true
 run_start: true
+run_stop: true
 run_register_user: true
 run_update_user_password: true
 run_import_sqlite_db: true
diff --git a/roles/matrix-common-after/tasks/main.yml b/roles/matrix-common-after/tasks/main.yml
index ea829fee5..4581024ea 100644
--- a/roles/matrix-common-after/tasks/main.yml
+++ b/roles/matrix-common-after/tasks/main.yml
@@ -4,5 +4,6 @@
     - start
 
 - import_tasks: "{{ role_path }}/tasks/stop.yml"
+  when: run_stop
   tags:
     - stop