diff --git a/src/modules/tiling/e_mod_tiling.c b/src/modules/tiling/e_mod_tiling.c
index bf41fa7f3..f569c3f9a 100644
--- a/src/modules/tiling/e_mod_tiling.c
+++ b/src/modules/tiling/e_mod_tiling.c
@@ -350,6 +350,7 @@ _restore_client(E_Client *ec)
    if (!extra->tiled)
      return NULL;
 
+   _client_untrack(ec);
    if (!ec->maximized && !ec->fullscreen)
      {
         _e_client_move_resize(ec, extra->orig.geom.x, extra->orig.geom.y,