diff --git a/Application/AppController.m b/Application/AppController.m
index 0eb4eccad..4acde2fac 100644
--- a/Application/AppController.m
+++ b/Application/AppController.m
@@ -210,11 +210,13 @@ static BOOL consentLastEnabled = NO;
 	[randomizeButton setToolTip:NSLocalizedString(@"RandomizeButtonTooltip", @"")];
 	[fileButton setToolTip:NSLocalizedString(@"FileButtonTooltip", @"")];
 
-	[self registerDefaultHotKeys];
-	
-	[self migrateHotKeys];
-
-	[self registerHotKeys];
+	if(@available(macOS 15, *)) {
+		[self registerDefaultHotKeys];
+		
+		[self migrateHotKeys];
+		
+		[self registerHotKeys];
+	}
 
 	(void)[spotlightWindowController init];
 
diff --git a/Preferences/Preferences/GeneralPreferencesPlugin.m b/Preferences/Preferences/GeneralPreferencesPlugin.m
index 7c191268e..18343c2f6 100644
--- a/Preferences/Preferences/GeneralPreferencesPlugin.m
+++ b/Preferences/Preferences/GeneralPreferencesPlugin.m
@@ -41,15 +41,26 @@
 	[[NSBundle bundleWithIdentifier:@"org.cogx.cog.preferences"] loadNibNamed:@"Preferences"
 	                                                                    owner:plugin
 	                                                          topLevelObjects:nil];
-	return @[[plugin playlistPane],
-			 [plugin hotKeyPane],
-			 [plugin updatesPane],
-			 [plugin outputPane],
-			 [plugin generalPane],
-			 [plugin notificationsPane],
-			 [plugin appearancePane],
-			 [plugin midiPane],
-			 [plugin rubberbandPane]];
+	if(@available(macos 15, *)) {
+		return @[[plugin playlistPane],
+				 [plugin hotKeyPane],
+				 [plugin updatesPane],
+				 [plugin outputPane],
+				 [plugin generalPane],
+				 [plugin notificationsPane],
+				 [plugin appearancePane],
+				 [plugin midiPane],
+				 [plugin rubberbandPane]];
+	} else {
+		return @[[plugin playlistPane],
+				 [plugin updatesPane],
+				 [plugin outputPane],
+				 [plugin generalPane],
+				 [plugin notificationsPane],
+				 [plugin appearancePane],
+				 [plugin midiPane],
+				 [plugin rubberbandPane]];
+	}
 }
 
 - (HotKeyPane *)hotKeyPane {