diff --git a/parts/scenes/net_rooms.lua b/parts/scenes/net_rooms.lua
index 1f72c2a7..93b230fa 100644
--- a/parts/scenes/net_rooms.lua
+++ b/parts/scenes/net_rooms.lua
@@ -52,7 +52,7 @@ function scene.keyDown(k)
 				end
 			end
 		elseif k=="return"then
-			if NET.getlock("fetchRoom")then return end
+			if NET.getlock("fetchRoom")or not NET.roomList[selected]then return end
 			if NET.roomList[selected].private then
 				LOG.print("Can't enter private room now")
 				return
@@ -72,6 +72,9 @@ function scene.update(dt)
 			fetchRoom()
 		end
 	end
+	if #NET.roomList>0 and not NET.roomList[selected]then
+		selected=#NET.roomList
+	end
 end
 
 function scene.draw()