diff --git a/src/components/mixins/zoffset.ts b/src/components/mixins/zoffset.ts
index 9ea91a429..02c072eda 100644
--- a/src/components/mixins/zoffset.ts
+++ b/src/components/mixins/zoffset.ts
@@ -30,9 +30,7 @@ export default class ZoffsetMixin extends Vue {
     }
 
     get endstop_pin() {
-        const stepperConfig = this.settings[this.stepper_name] ?? {}
-
-        return stepperConfig?.endstop_pin.trim()
+        return this.settings[this.stepper_name]?.endstop_pin?.trim() ?? null
     }
 
     get zOffset(): number {
diff --git a/src/components/settings/SettingsControlTab.vue b/src/components/settings/SettingsControlTab.vue
index 6a8ff0f76..6c06182a8 100644
--- a/src/components/settings/SettingsControlTab.vue
+++ b/src/components/settings/SettingsControlTab.vue
@@ -178,18 +178,20 @@
                     </settings-row>
                     <v-divider class="my-2" />
                 </template>
-                <settings-row
-                    :title="$t('Settings.ControlTab.ZOffsetSaveOption')"
-                    :sub-title="$t('Settings.ControlTab.ZOffsetSaveOptionDescription')">
-                    <v-select
-                        v-model="offsetZSaveOption"
-                        :items="offsetZSaveOptions"
-                        class="mt-0"
-                        hide-details
-                        outlined
-                        dense />
-                </settings-row>
-                <v-divider class="my-2" />
+                <template v-if="klipperReadyForGui && endstop_pin !== null">
+                    <settings-row
+                        :title="$t('Settings.ControlTab.ZOffsetSaveOption')"
+                        :sub-title="$t('Settings.ControlTab.ZOffsetSaveOptionDescription')">
+                        <v-select
+                            v-model="offsetZSaveOption"
+                            :items="offsetZSaveOptions"
+                            class="mt-0"
+                            hide-details
+                            outlined
+                            dense />
+                    </settings-row>
+                    <v-divider class="my-2" />
+                </template>
                 <settings-row :title="$t('Settings.ControlTab.ZOffsetIncrements')" :mobile-second-row="true">
                     <v-combobox
                         v-model="offsetsZ"
@@ -580,7 +582,7 @@ export default class SettingsControlTab extends Mixins(BaseMixin, ControlMixin,
     }
 
     mounted() {
-        this.$refs.formControlExtruder.validate()
+        this.$refs.formControlExtruder?.validate()
     }
 }
 </script>