diff --git a/CHANGES b/CHANGES
index 1454aeb76..c735dd44e 100644
--- a/CHANGES
+++ b/CHANGES
@@ -19,6 +19,7 @@ Other fixes:
  - Core: Ensure ELF regions can be written before trying
  - Core: Fix ELF loading regression (fixes mgba.io/i/1669)
  - Core: Fix crash modifying hash table entry (fixes mgba.io/i/1673)
+ - GB Video: Fix some cases where SGB border doesn't draw to mutli-buffers
  - GBA: Reject incorrectly sized BIOSes
  - Debugger: Don't skip undefined instructions when debugger attached
  - Qt: Force OpenGL paint engine creation thread (fixes mgba.io/i/1642)
diff --git a/src/gb/renderers/software.c b/src/gb/renderers/software.c
index 661a4363f..4d3f8b284 100644
--- a/src/gb/renderers/software.c
+++ b/src/gb/renderers/software.c
@@ -705,7 +705,9 @@ static void GBVideoSoftwareRendererFinishFrame(struct GBVideoRenderer* renderer)
 		case SGB_PAL_TRN:
 		case SGB_CHR_TRN:
 		case SGB_PCT_TRN:
-			if (softwareRenderer->sgbTransfer > 0 && softwareRenderer->sgbBorders && !renderer->sgbRenderMode) {
+		case SGB_ATRC_EN:
+		case SGB_MASK_EN:
+			if (softwareRenderer->sgbBorders && !renderer->sgbRenderMode) {
 				// Make sure every buffer sees this if we're multibuffering
 				_regenerateSGBBorder(softwareRenderer);
 			}