diff --git a/src/modules/tiling/e_mod_tiling.c b/src/modules/tiling/e_mod_tiling.c
index 2fb4d45bd..997d0f098 100644
--- a/src/modules/tiling/e_mod_tiling.c
+++ b/src/modules/tiling/e_mod_tiling.c
@@ -504,6 +504,9 @@ _remove_client(E_Client *ec)
          return;
       }
 
+    if (!extra->tiled)
+       return;
+
     extra->tiled = EINA_FALSE;
 
     /* Window tree updating. */