diff --git a/gfx/d3d9/d3d9.cpp b/gfx/d3d9/d3d9.cpp
index 8d53439fce..2a84cc102c 100644
--- a/gfx/d3d9/d3d9.cpp
+++ b/gfx/d3d9/d3d9.cpp
@@ -1396,7 +1396,7 @@ static void d3d9_set_aspect_ratio(void *data, unsigned aspect_ratio_idx)
    switch (aspect_ratio_idx)
    {
       case ASPECT_RATIO_SQUARE:
-         gfx_set_square_pixel_viewport(g_extern.frame_cache.width, g_extern.frame_cache.height);
+         gfx_set_square_pixel_viewport(g_system.system.av_info.geometry.base_width, g_extern.system.av_info.geometry.base_height);
          break;
 
       case ASPECT_RATIO_CORE:
diff --git a/gfx/gl.c b/gfx/gl.c
index 383e0db945..2ef44ac661 100644
--- a/gfx/gl.c
+++ b/gfx/gl.c
@@ -2400,7 +2400,7 @@ static void gl_set_aspect_ratio(void *data, unsigned aspect_ratio_idx)
    switch (aspect_ratio_idx)
    {
       case ASPECT_RATIO_SQUARE:
-         gfx_set_square_pixel_viewport(g_extern.frame_cache.width, g_extern.frame_cache.height);
+         gfx_set_square_pixel_viewport(g_extern.system.av_info.geometry.base_width, g_extern.system.av_info.geometry.base_height);
          break;
 
       case ASPECT_RATIO_CORE:
diff --git a/gx/gx_video.c b/gx/gx_video.c
index 9b5c67af17..de64993f4e 100644
--- a/gx/gx_video.c
+++ b/gx/gx_video.c
@@ -286,7 +286,7 @@ static void gx_set_aspect_ratio(void *data, unsigned aspect_ratio_idx)
    gx_video_t *gx = (gx_video_t*)driver.video_data;
 
    if (aspect_ratio_idx == ASPECT_RATIO_SQUARE)
-      gfx_set_square_pixel_viewport(g_extern.frame_cache.width, g_extern.frame_cache.height);
+      gfx_set_square_pixel_viewport(g_extern.system.av_info.geometry.base_width, g_extern.system.av_info.geometry.base_height);
    else if (aspect_ratio_idx == ASPECT_RATIO_CORE)
       gfx_set_core_viewport();
    else if (aspect_ratio_idx == ASPECT_RATIO_CONFIG)