diff --git a/PlayWallPlugins/PlayWallPluginContentPlayer/src/main/scala/de/tobias/playpad/plugin/content/settings/ContentPlayerSettingsViewController.scala b/PlayWallPlugins/PlayWallPluginContentPlayer/src/main/scala/de/tobias/playpad/plugin/content/settings/ContentPlayerSettingsViewController.scala
index 232afcb4edf0fa98c5b8bbdd3a7236d8b2efa6dc..f76e44fbf37d6595df7a57bbea8bb2104b0c795a 100644
--- a/PlayWallPlugins/PlayWallPluginContentPlayer/src/main/scala/de/tobias/playpad/plugin/content/settings/ContentPlayerSettingsViewController.scala
+++ b/PlayWallPlugins/PlayWallPluginContentPlayer/src/main/scala/de/tobias/playpad/plugin/content/settings/ContentPlayerSettingsViewController.scala
@@ -157,15 +157,15 @@ class ContentPlayerSettingsViewController extends ProfileSettingsTabViewControll
 	override def loadSettings(settings: Profile): Unit = {
 		val configuration = ContentPlayerSettingsViewController.getZoneConfiguration
 		startZoneHash = configuration.zones.hashCode
-		startScreenHash = configuration.screen.hashCode
+		startScreenHash = if (configuration.screen != null) configuration.screen.hashCode else 0
 
 		listView.getItems.setAll(configuration.zones)
 
 		val screens = ContentPlayerWindow.GetScreens
 		val selectedScreen = configuration.screen
 		screenComboBox.getSelectionModel.select(new SelectableContentScreen(screens
-		  .find(screen => screen.getName == selectedScreen)
-		  .getOrElse(screens.head)))
+			.find(screen => screen.getName == selectedScreen)
+			.getOrElse(screens.head)))
 
 		ffmpegTextField.setText(configuration.ffmpegExecutable)
 		ffprobeTextField.setText(configuration.ffprobeExecutable)
@@ -188,8 +188,8 @@ class ContentPlayerSettingsViewController extends ProfileSettingsTabViewControll
 	}
 
 	override def needReload(): Boolean = startZoneHash != ContentPlayerSettingsViewController.getZoneConfiguration.zones.hashCode ||
-	  startScreenHash != ContentPlayerSettingsViewController.getZoneConfiguration.screen.hashCode ||
-	  !listView.getSelectionModel.isEmpty
+		startScreenHash != ContentPlayerSettingsViewController.getZoneConfiguration.screen.hashCode ||
+		!listView.getSelectionModel.isEmpty
 
 	override def validSettings(): Boolean = {
 		true