diff --git a/gfx/video_driver.c b/gfx/video_driver.c
index 67fc41a27b..f1e7dcb83a 100644
--- a/gfx/video_driver.c
+++ b/gfx/video_driver.c
@@ -1630,9 +1630,11 @@ void video_driver_init(void)
 {
    bool initialized = false;
    video_driver_lock_new();
-   video_driver_msg_queue_init();
 
-   init_video();
+   initialized = init_video();
+
+   if (initialized)
+      video_driver_msg_queue_init();
 }
 
 void video_driver_destroy_data(void)