diff --git a/workspace.cpp b/workspace.cpp
index ec1e8a4773..f9fe03655f 100644
--- a/workspace.cpp
+++ b/workspace.cpp
@@ -910,12 +910,11 @@ void Workspace::slotReconfigure()
     updateToolWindows(true);
 
     RuleBook::self()->load();
-    for (auto it = m_allClients.begin();
-            it != m_allClients.end();
-            ++it) {
-        (*it)->setupWindowRules(true);
-        (*it)->applyWindowRules();
-        RuleBook::self()->discardUsed(*it, false);
+    for (AbstractClient *client : m_allClients) {
+        if (client->supportsWindowRules()) {
+            client->evaluateWindowRules();
+            RuleBook::self()->discardUsed(client, false);
+        }
     }
 
     if (borderlessMaximizedWindows != options->borderlessMaximizedWindows() &&