diff --git a/src/xinerama.c b/src/xinerama.c
index 81359ec2..15e8b0a3 100644
--- a/src/xinerama.c
+++ b/src/xinerama.c
@@ -425,7 +425,7 @@ void xinerama_requery_screens(xcb_connection_t *conn) {
         /* Check for workspaces which need to be assigned to specific screens
          * which may now be available */
         TAILQ_FOREACH(ws, workspaces, workspaces) {
-                if (ws->preferred_screen == NULL)
+                if (ws->preferred_screen == NULL || ws->screen == NULL)
                         continue;
 
                 workspace_initialize(ws, ws->screen, true);