diff --git a/src/modules/tiling/e_mod_tiling.c b/src/modules/tiling/e_mod_tiling.c
index de0ba039f..d0874bd17 100644
--- a/src/modules/tiling/e_mod_tiling.c
+++ b/src/modules/tiling/e_mod_tiling.c
@@ -640,8 +640,11 @@ _client_remove_no_apply(E_Client *ec)
 static void
 _remove_client(E_Client *ec)
 {
-   if (_client_remove_no_apply(ec))
-      _reapply_tree();
+   if (desk_should_tile_check(ec->desk))
+     {
+        if (_client_remove_no_apply(ec))
+          _reapply_tree();
+     }
 }
 
 /* }}} */