diff --git a/imports/shared/utils/AutoConfig.qml b/imports/shared/utils/AutoConfig.qml
index 5c567f7..e49a513 100644
--- a/imports/shared/utils/AutoConfig.qml
+++ b/imports/shared/utils/AutoConfig.qml
@@ -54,7 +54,6 @@ QtObject {
     property int symbolSizeL: 96
     property int symbolSizeXL: 114
     property int symbolSizeXXL: 192
-    property bool showClusterIfPossible: false
 
     property string displayBackground: "background_1920x1080"
 
@@ -109,8 +108,7 @@ QtObject {
 
         fontWeight = Font.Light
 
-        var canDisplayCluster = Screen.desktopAvailableWidth > Screen.width || ScreenManager.screenCount() > 1
-        if (canDisplayCluster) {
+        if (showClusterIfPossible) {
             print("Instrument Cluster enabled")
             withCluster = true
             clusterWidth = ScreenManager.availableScreens[1].size.width
diff --git a/imports/shared/utils/Style.qml b/imports/shared/utils/Style.qml
index dfb3e2d..cf7f20f 100644
--- a/imports/shared/utils/Style.qml
+++ b/imports/shared/utils/Style.qml
@@ -90,12 +90,11 @@ QtObject {
     property bool showClusterIfPossible: isClient ? ApplicationInterface.additionalConfiguration.showCluster :ApplicationManager.additionalConfiguration.showCluster
 
     property Loader styleLoader: Loader {
+        property bool showClusterIfPossible: root.showClusterIfPossible
         source: styleConfig === "auto" ? Qt.resolvedUrl("AutoConfig.qml") : styleConfig
 
         onLoaded: {
             print("StyleConfig loaded: ", source)
-            if (item.showClusterIfPossible)
-                item.showClusterIfPossible = root.showClusterIfPossible
         }
     }