diff --git a/src/modules/tiling/e_mod_tiling.c b/src/modules/tiling/e_mod_tiling.c
index db1f7d6e3..ac4c4bc78 100644
--- a/src/modules/tiling/e_mod_tiling.c
+++ b/src/modules/tiling/e_mod_tiling.c
@@ -464,16 +464,17 @@ _remove_client(E_Client *ec)
     if (!ec)
        return;
 
-    if (!is_tilable(ec))
-       return;
-
     DBG("removing %p", ec);
 
     Client_Extra *extra = eina_hash_find(_G.client_extras, &ec);
-    if (!extra) {
-        ERR("No extra for %p", ec);
-        return;
-    }
+    if (!extra)
+      {
+         if (is_tilable(ec))
+           {
+              ERR("No extra for %p", ec);
+           }
+         return;
+      }
 
     extra->tiled = EINA_FALSE;