diff --git a/src/session/session.c b/src/session/session.c
index 77e0d690..5c78b335 100644
--- a/src/session/session.c
+++ b/src/session/session.c
@@ -1143,7 +1143,13 @@ decode_session_info(struct terminal *term, struct terminal_info *info)
 		 * to hook up with the master so we can handle request for
 		 * stuff in current tab. */
 		base_session = get_master_session();
-		if (!base_session) return 0;
+		if (!base_session) {
+			base_session = sessions.next;
+
+			if (!base_session) {
+				return 0;
+			}
+		}
 
 		break;