diff --git a/src/xrt/state_trackers/gui/gui_scene_debug.c b/src/xrt/state_trackers/gui/gui_scene_debug.c
index 1755f54d1..0727253b4 100644
--- a/src/xrt/state_trackers/gui/gui_scene_debug.c
+++ b/src/xrt/state_trackers/gui/gui_scene_debug.c
@@ -1027,11 +1027,6 @@ scene_destroy(struct gui_scene *scene, struct gui_program *p)
 void
 gui_scene_debug(struct gui_program *p)
 {
-	// Only create devices if we have a instance and no system devices.
-	if (p->instance != NULL && p->xsysd == NULL) {
-		gui_prober_select(p);
-	}
-
 	struct debug_scene *ds = U_TYPED_CALLOC(struct debug_scene);
 
 	ds->base.render = scene_render;
diff --git a/src/xrt/targets/gui/gui_sdl2_main.c b/src/xrt/targets/gui/gui_sdl2_main.c
index 3b1be04bf..570b55c15 100644
--- a/src/xrt/targets/gui/gui_sdl2_main.c
+++ b/src/xrt/targets/gui/gui_sdl2_main.c
@@ -39,7 +39,14 @@ main(int argc, char **argv)
 
 	// First scene to start with.
 	if (argc >= 2 && strcmp("debug", argv[1]) == 0) {
-		// We have created a prober select devices now.
+		/*
+		 * We have created a prober select devices now, only create
+		 * devices if we have a instance and no system devices.
+		 */
+		if (p.base.instance != NULL && p.base.xsysd == NULL) {
+			gui_prober_select(&p.base);
+		}
+
 		gui_scene_debug(&p.base);
 	} else if (argc >= 2 && strcmp("calibrate", argv[1]) == 0) {
 		gui_scene_select_video_calibrate(&p.base);