diff --git a/gfx/video_display_server.c b/gfx/video_display_server.c
index 14b9ad5a16..26ef1e2de2 100644
--- a/gfx/video_display_server.c
+++ b/gfx/video_display_server.c
@@ -47,10 +47,8 @@ const char *video_display_server_get_ident(void)
    return current_display_server->ident;
 }
 
-void* video_display_server_init(void)
+void* video_display_server_init(enum rarch_display_type type)
 {
-   enum rarch_display_type type = video_driver_display_type_get();
-
    video_display_server_destroy();
 
    switch (type)
diff --git a/gfx/video_display_server.h b/gfx/video_display_server.h
index 74866e793c..151e60fe49 100644
--- a/gfx/video_display_server.h
+++ b/gfx/video_display_server.h
@@ -59,7 +59,7 @@ typedef struct video_display_server
    const char *ident;
 } video_display_server_t;
 
-void* video_display_server_init(void);
+void* video_display_server_init(enum rarch_display_type type);
 
 void video_display_server_destroy(void);
 
diff --git a/retroarch.c b/retroarch.c
index dec609453e..1c9009f524 100644
--- a/retroarch.c
+++ b/retroarch.c
@@ -20782,7 +20782,7 @@ static bool video_driver_init_internal(bool *video_is_threaded)
 
    video_context_driver_reset();
 
-   video_display_server_init();
+   video_display_server_init(video_driver_display_type);
 
    if ((enum rotation)settings->uints.screen_orientation != ORIENTATION_NORMAL)
       video_display_server_set_screen_orientation((enum rotation)settings->uints.screen_orientation);