diff --git a/code/game/machinery/computer/vr_control.dm b/code/game/machinery/computer/vr_control.dm
index 9732234d48e..b1fded03b99 100644
--- a/code/game/machinery/computer/vr_control.dm
+++ b/code/game/machinery/computer/vr_control.dm
@@ -27,6 +27,7 @@
 	switch(alert("What would you like to do?", "VR Control", "Join Room", "Make Room", "Cancel"))
 		if("Join Room")
 			spawn_vr_avatar(user, input(user, "Choose a room to join.","Select Level") as null|anything in vr_rooms)
+			qdel(user)
 		if("Make Room")
 			make_vr_room(input(user, "Name your new Room","Name here.") as null|text, input(user, "Choose a Level to load into your new Room.","Select Level") as null|anything in vr_templates)
 		if("Cancel")
diff --git a/code/modules/vr/vr_controller.dm b/code/modules/vr/vr_controller.dm
index 9ab22ff5e0e..45bf2a6cc74 100644
--- a/code/modules/vr/vr_controller.dm
+++ b/code/modules/vr/vr_controller.dm
@@ -59,4 +59,5 @@ proc/spawn_vr_avatar(mob/living/carbon/human/H, datum/vr_room/room)
 
 //Preloaded rooms
 /hook/roundstart/proc/starting_levels()
-	make_vr_room("Lobby", "lobby", 0)
\ No newline at end of file
+	make_vr_room("Lobby", "lobby", 0)
+	return 1
\ No newline at end of file