diff --git a/src/core/window.c b/src/core/window.c
index d7d3e1b59..d5c92102b 100644
--- a/src/core/window.c
+++ b/src/core/window.c
@@ -1288,7 +1288,10 @@ _meta_window_shared_new (MetaDisplay         *display,
                                                                      window->initial_workspace);
         }
 
-      set_workspace_state (window, on_all_workspaces, workspace);
+      /* Ignore when a window requests to be placed on a non-existent workspace
+       */
+      if (on_all_workspaces || workspace != NULL)
+        set_workspace_state (window, on_all_workspaces, workspace);
     }
 
   /* override-redirect windows are subtly different from other windows