diff --git a/src/java.desktop/macosx/native/libawt_lwawt/awt/CGraphicsDevice.m b/src/java.desktop/macosx/native/libawt_lwawt/awt/CGraphicsDevice.m
index 32164493f9f..70f0741347a 100644
--- a/src/java.desktop/macosx/native/libawt_lwawt/awt/CGraphicsDevice.m
+++ b/src/java.desktop/macosx/native/libawt_lwawt/awt/CGraphicsDevice.m
@@ -60,16 +60,14 @@ static int getBPPFromModeString(CFStringRef mode)
 }
 
 static BOOL isValidDisplayMode(CGDisplayModeRef mode) {
-    // Workaround for apple bug FB13261205, since it only affects arm based macs
-    // and arm support started with macOS 11 ignore the workaround for previous versions
-    if (@available(macOS 11, *)) {
-        if (architecture == -1) {
-            architecture = [[NSRunningApplication currentApplication] executableArchitecture];
-        }
-        if (architecture == NSBundleExecutableArchitectureARM64) {
-            return (CGDisplayModeGetPixelWidth(mode) >= 800);
-        }
+    // Workaround for apple bug FB13261205, only affects arm based macs
+    if (architecture == -1) {
+        architecture = [[NSRunningApplication currentApplication] executableArchitecture];
     }
+    if (architecture == NSBundleExecutableArchitectureARM64) {
+        return (CGDisplayModeGetPixelWidth(mode) >= 800);
+    }
+
     return (1 < CGDisplayModeGetWidth(mode) && 1 < CGDisplayModeGetHeight(mode));
 }