diff --git a/output/dll/sameboy.wbx.gz b/output/dll/sameboy.wbx.gz
index c810c4beea..400fff95a3 100644
Binary files a/output/dll/sameboy.wbx.gz and b/output/dll/sameboy.wbx.gz differ
diff --git a/waterbox/sameboy/memory.c b/waterbox/sameboy/memory.c
index f53aac608d..6988beb4cd 100644
--- a/waterbox/sameboy/memory.c
+++ b/waterbox/sameboy/memory.c
@@ -135,12 +135,14 @@ static uint8_t read_high_memory(GB_gameboy_t *gb, uint16_t addr)
     }
 
     if (addr < 0xFF80) {
-		if (addr == 0xff00 && gb->is_sgb)
+		if (addr == 0xff00)
 		{
 			if (gb->input_callback)
 				gb->input_callback(gb);
 			gb->lagged = false;
-			return sgb_read_ff00(gb->cycles_since_epoch);
+			if (gb->is_sgb) {
+				return sgb_read_ff00(gb->cycles_since_epoch);
+			}
 		}
 
         switch (addr & 0xFF) {