diff --git a/src/components/mixins/base.ts b/src/components/mixins/base.ts
index 487edace..69902e85 100644
--- a/src/components/mixins/base.ts
+++ b/src/components/mixins/base.ts
@@ -34,6 +34,8 @@ export default class BaseMixin extends Vue {
     }
 
     get klipperState(): string {
+        if (!this.klippyIsConnected) return 'disconnected'
+
         return this.$store.state.server.klippy_state ?? ''
     }
 
diff --git a/src/components/panels/KlippyStatePanel.vue b/src/components/panels/KlippyStatePanel.vue
index edc7426a..58f1f8e5 100644
--- a/src/components/panels/KlippyStatePanel.vue
+++ b/src/components/panels/KlippyStatePanel.vue
@@ -97,7 +97,7 @@
                 </p>
                 <connection-status :moonraker="true" :klipper="false"></connection-status>
                 <p class="mt-2 mb-0 text-center">{{ $t('Panels.KlippyStatePanel.MoonrakerCannotConnect') }}</p>
-                <p class="mb-0 text-center">{{ $t('Panels.KlippyStatePanel.KlipperCheck') }}</p>
+                <p class="mb-0 text-center">{{ $t('Panels.KlippyStatePanel.CheckKlippyAndUdsAddress') }}</p>
             </v-alert>
         </template>
     </div>
diff --git a/src/locales/de.json b/src/locales/de.json
index aec9bf04..49af68fd 100644
--- a/src/locales/de.json
+++ b/src/locales/de.json
@@ -507,8 +507,8 @@
             "WebcamOff": "Aus"
         },
         "KlippyStatePanel": {
+            "CheckKlippyAndUdsAddress": "Bitte überprüfen, ob der Klipper-Dienst läuft und klippy_uds_address in der moonraker.conf korrekt konfiguriert ist.",
             "FirmwareRestart": "Firmware Neustart",
-            "KlipperCheck": "Bitte überprüfen Sie, ob der Klipper-Dienst läuft und ein UDS (Unix Domain Socket) konfiguriert ist.",
             "MoonrakerCannotConnect": "Moonraker kann keine Verbindung zu Klipper herstellen!",
             "PowerOn": "Drucker einschalten",
             "PrinterSwitchedOff": "Drucker ist ausgeschaltet",
diff --git a/src/locales/en.json b/src/locales/en.json
index d36156ce..eabe4897 100644
--- a/src/locales/en.json
+++ b/src/locales/en.json
@@ -517,8 +517,8 @@
             "WebcamOff": "Off"
         },
         "KlippyStatePanel": {
+            "CheckKlippyAndUdsAddress": "Please check if the Klipper service is running and klippy_uds_address is correctly configured in the moonraker.conf.",
             "FirmwareRestart": "Firmware Restart",
-            "KlipperCheck": "Please check if the Klipper service is running.",
             "MoonrakerCannotConnect": "Moonraker can't connect to Klipper!",
             "PowerOn": "Power on",
             "PrinterSwitchedOff": "Printer is powered off",