diff --git a/site_ansto/motor_dmc2280.c b/site_ansto/motor_dmc2280.c
index a6ee74cf..624d02ed 100644
--- a/site_ansto/motor_dmc2280.c
+++ b/site_ansto/motor_dmc2280.c
@@ -2245,13 +2245,13 @@ static void DMCState_Moving(pDMC2280Driv self, pEvtEvent event) {
             if (self->stopCode == 2) {
               self->errorCode = FWDLIM;
               self->driver_status = HWFault;
-              change_state(self, DMCState_OffTimer);
+              change_state(self, DMCState_MotorHalt);
               return;
             }
             else if (self->stopCode == 3) {
               self->errorCode = RVRSLIM;
               self->driver_status = HWFault;
-              change_state(self, DMCState_OffTimer);
+              change_state(self, DMCState_MotorHalt);
               return;
             }
             else if (self->stopCode == 4) {
@@ -2268,7 +2268,7 @@ static void DMCState_Moving(pDMC2280Driv self, pEvtEvent event) {
                 self->driver_status = HWFault;
               }
               if (self->driver_status == HWFault) {
-                change_state(self, DMCState_OffTimer);
+                change_state(self, DMCState_MotorHalt);
                 return;
               }
             }
@@ -2276,7 +2276,7 @@ static void DMCState_Moving(pDMC2280Driv self, pEvtEvent event) {
             snprintf(self->dmc2280Error, CMDLEN, "BAD Stop Code %d",
                 self->stopCode);
             self->driver_status = HWFault;
-            change_state(self, DMCState_OffTimer);
+            change_state(self, DMCState_MotorHalt);
             return;
           }
           if (self->moving) {