diff --git a/src/gb/GB.cpp b/src/gb/GB.cpp
index 2606b39d..02584c00 100644
--- a/src/gb/GB.cpp
+++ b/src/gb/GB.cpp
@@ -2129,7 +2129,7 @@ void gbGetHardwareType()
 {
   gbCgbMode = 0;
   gbSgbMode = 0;
-  if(gbRom[0x143] & 0x80) {
+  if((gbRom[0x143] & 0x80) && !((gbRom[0x146] == 0x03) && (gbBorderAutomatic))) {
     if((gbEmulatorType == 0) ||
        gbEmulatorType == 1 ||
        gbEmulatorType == 4) {