diff --git a/src/components/panels/ZOffsetPanel.vue b/src/components/panels/ZOffsetPanel.vue
index f44cdd6f..f282895a 100644
--- a/src/components/panels/ZOffsetPanel.vue
+++ b/src/components/panels/ZOffsetPanel.vue
@@ -13,7 +13,7 @@
         <v-card-text class="py-1">
             <v-row class="">
                 <v-col class="col-12 pb-0 text-center">
-                    <p>Current Offset: {{ base_zpos.toFixed(2) }}mm</p>
+                    <p>Current Offset: {{ homing_origin.length > 1 ? homing_origin[2].toFixed(2) : 0.00 }}mm</p>
                 </v-col>
             </v-row>
             <v-row>
@@ -51,7 +51,7 @@
         computed: {
             ...mapState({
                 loadings: state => state.loadings,
-                base_zpos: state => state.printer.gcode_move.base_zpos,
+                homing_origin: state => state.printer.gcode_move.homing_origin,
                 printer_state: state => state.printer.print_stats.state,
                 homed_axis: state => state.printer.toolhead.homed_axes,
             }),
diff --git a/src/store/index.js b/src/store/index.js
index 519fc637..42024a8f 100644
--- a/src/store/index.js
+++ b/src/store/index.js
@@ -110,7 +110,7 @@ export default new Vuex.Store({
             gcode_move: {
                 extrude_factor: 1,
                 speed_factor: 1,
-                base_zpos: 0,
+                homing_origin: [0,0,0,0],
                 absolute_coordinates: true,
                 absolute_extrude: true,
                 speed: 0,