diff --git a/src/tabbox/clientmodel.cpp b/src/tabbox/clientmodel.cpp
index 29f968d5be..02799e5b30 100644
--- a/src/tabbox/clientmodel.cpp
+++ b/src/tabbox/clientmodel.cpp
@@ -223,7 +223,8 @@ void ClientModel::createClientList(bool partialReset)
         });
     }
 
-    if (tabBox->config().clientApplicationsMode() != TabBoxConfig::AllWindowsCurrentApplication
+    if (!m_mutableClientList.isEmpty()
+        && tabBox->config().clientApplicationsMode() != TabBoxConfig::AllWindowsCurrentApplication
         && tabBox->config().showDesktopMode() == TabBoxConfig::ShowDesktopClient) {
         Window *desktopClient = tabBox->desktopClient();
         if (desktopClient) {