diff --git a/src/libretro/libretro.cpp b/src/libretro/libretro.cpp
index af47199f..b2a8d71b 100644
--- a/src/libretro/libretro.cpp
+++ b/src/libretro/libretro.cpp
@@ -581,8 +581,8 @@ void retro_get_system_av_info(struct retro_system_av_info *info)
 
    if (type == IMAGE_GB) {
       aspect = !gbBorderOn ? (10.0 / 9.0) : (8.0 / 7.0);
-      maxWidth = sgbWidth;
-      maxHeight = sgbHeight;
+      maxWidth = !gbBorderOn ? gbWidth : sgbWidth;
+      maxHeight = !gbBorderOn ? gbHeight : sgbHeight;
    }
 
    info->geometry.base_width = systemWidth;