diff --git a/dist-persist/wbstack/src/Settings/LocalSettings.php b/dist-persist/wbstack/src/Settings/LocalSettings.php
index f02812f4a..799e0fdba 100644
--- a/dist-persist/wbstack/src/Settings/LocalSettings.php
+++ b/dist-persist/wbstack/src/Settings/LocalSettings.php
@@ -138,6 +138,9 @@
     ];
 }
 
+// Limit expensive queries (T399804)
+$wgMaxExecutionTimeForExpensiveQueries = 5_000;
+
 // Jobs
 # For now jobs will run in the requests, this obviously isn't the ideal solution and really
 # there should be a job running service deployed...
diff --git a/dist/wbstack/src/Settings/LocalSettings.php b/dist/wbstack/src/Settings/LocalSettings.php
index f02812f4a..799e0fdba 100644
--- a/dist/wbstack/src/Settings/LocalSettings.php
+++ b/dist/wbstack/src/Settings/LocalSettings.php
@@ -138,6 +138,9 @@
     ];
 }
 
+// Limit expensive queries (T399804)
+$wgMaxExecutionTimeForExpensiveQueries = 5_000;
+
 // Jobs
 # For now jobs will run in the requests, this obviously isn't the ideal solution and really
 # there should be a job running service deployed...