diff --git a/src/py/bbctrl/Mach.py b/src/py/bbctrl/Mach.py
index 2aee1ef..0d0b754 100644
--- a/src/py/bbctrl/Mach.py
+++ b/src/py/bbctrl/Mach.py
@@ -363,6 +363,10 @@ class Mach(Comm):
             # If homed, change the offset rather than the absolute position
             self.mdi('G92%s%f' % (axis, position))
 
+            #storing the offset to config
+            self.ctrl.config.set('axes', {'offset_' + axis : state.get(axis + 'p')})
+            self.log.info('set_position: {} = {} '.format(axis, state.get(axis + 'p')))
+
         elif state.is_axis_enabled(axis):
             if self._get_cycle() != 'idle' and not self._is_paused():
                 raise Exception('Cannot set position during ' +
diff --git a/src/py/bbctrl/State.py b/src/py/bbctrl/State.py
index 72d1c76..c89bdde 100644
--- a/src/py/bbctrl/State.py
+++ b/src/py/bbctrl/State.py
@@ -243,11 +243,6 @@ class State(object):
             if self.timeout is None:
                 self.timeout = self.ctrl.ioloop.call_later(0.25, self._notify)
 
-        # Storing origin to config
-        if name in ['offset_x', 'offset_y', 'offset_z'] and self.vars.get('cycle') == 'mdi':
-            self.ctrl.config.set('axes', {name: value})
-            self.set('cycle', 'idle')
-
         # Loading origin from config after homing 
         if load_position and self.vars.get('cycle') == 'idle':
             for axis in 'xyz':