diff --git a/test-and-deploy.yml b/test-and-deploy.yml
index 8a8bb6c8b7df97449a86dacc0ea0f5dd01a40e16..d772987da6145f285ef386e743bea95d28952f54 100644
--- a/test-and-deploy.yml
+++ b/test-and-deploy.yml
@@ -595,7 +595,7 @@ Debug:
     - grep "users_data" /tmp/test.log || EC=$?
     - if [[ $EC -ne 0 ]]; then INITIAL="yes"; fi
     - rm /tmp/test.log >/dev/null 2>&1 || true
-    - if [[ "$INITIAL" == "no" ]]; then drush -y sset system.maintenance_mode 1; fi
+    - if [[ "$INITIAL" == "no" ]]; then drush -y sset system.maintenance_mode 1 || drush cr && drush -y sset system.maintenance_mode 1; fi
     - cd -
     - cd web/sites/default
     - rm files