diff --git a/console/rarch_console_video.c b/console/rarch_console_video.c
index f169f7ee55..734626e9bc 100644
--- a/console/rarch_console_video.c
+++ b/console/rarch_console_video.c
@@ -83,6 +83,10 @@ void rarch_set_auto_viewport(unsigned width, unsigned height)
 void rarch_set_core_viewport()
 {
    struct retro_system_av_info info;
+
+   if (!g_console.emulator_initialized)
+      return;
+
    retro_get_system_av_info(&info);
 
    // fallback to 1:1 pixel ratio if none provided
diff --git a/gx/frontend/main.c b/gx/frontend/main.c
index 6c51678ee9..bc4858e709 100644
--- a/gx/frontend/main.c
+++ b/gx/frontend/main.c
@@ -358,8 +358,7 @@ begin_loop:
 
       input_gx.poll(NULL);
 
-      rarch_set_auto_viewport(g_extern.frame_cache.width, g_extern.frame_cache.height);
-      rarch_set_core_viewport();
+      video_set_aspect_ratio_func(g_console.aspect_ratio_index);
 
       audio_start_func();
 
diff --git a/ps3/frontend/main.c b/ps3/frontend/main.c
index 5b3951eed6..acb748a2ad 100644
--- a/ps3/frontend/main.c
+++ b/ps3/frontend/main.c
@@ -316,8 +316,7 @@ begin_loop:
 
       input_ps3.poll(NULL);
 
-      rarch_set_auto_viewport(g_extern.frame_cache.width, g_extern.frame_cache.height);
-      rarch_set_core_viewport();
+      video_set_aspect_ratio_func(g_console.aspect_ratio_index);
 
       do{
          repeat = rarch_main_iterate();
diff --git a/xdk/frontend/main.c b/xdk/frontend/main.c
index a84c973296..dc35b1e34a 100644
--- a/xdk/frontend/main.c
+++ b/xdk/frontend/main.c
@@ -188,8 +188,7 @@ begin_loop:
 
       input_xinput.poll(NULL);
 
-      rarch_set_auto_viewport(g_extern.frame_cache.width, g_extern.frame_cache.height);
-      rarch_set_core_viewport();
+      video_set_aspect_ratio_func(g_console.aspect_ratio_index);
 
       do{
          repeat = rarch_main_iterate();