diff --git a/site_ansto/instrument/hrpd/DMC2280/controller3.txt b/site_ansto/instrument/hrpd/DMC2280/controller3.txt
index cb99e3bf..4e5ac406 100644
--- a/site_ansto/instrument/hrpd/DMC2280/controller3.txt
+++ b/site_ansto/instrument/hrpd/DMC2280/controller3.txt
@@ -16,7 +16,7 @@ CN 1
 AC 25000,25000,25000,25000,10000,10000,10000,10000
 DC 25000,25000,25000,25000,60000,60000,60000,60000
 SP 25000,25000,25000,25000,30000,30000,30000,30000
-XQ#HOME,1
+HOMERUN=0
 #LOOPER
 JP#LOOPER
 EN
@@ -34,6 +34,9 @@ EN
 #TCPERR
 RE
 #HOME
+IF (HOMERUN = 1)
+JP #ENDHOME
+ENDIF
 NOTE Move slit forward 10mm if it is against the reverse limit switch
 IF ((_TSE & 4) = 0)
 SHE
@@ -77,6 +80,8 @@ BGEFGH
 AMEFGH
 DP ,,,,0,0,0,0
 SP ,,,,30000,30000,30000,30000
+HOMERUN=1
+#ENDHOME
 EN
 
 
diff --git a/site_ansto/instrument/hrpd/DMC2280/controller4.txt b/site_ansto/instrument/hrpd/DMC2280/controller4.txt
index 566e4a6f..a1e98c9f 100644
--- a/site_ansto/instrument/hrpd/DMC2280/controller4.txt
+++ b/site_ansto/instrument/hrpd/DMC2280/controller4.txt
@@ -16,7 +16,7 @@ CN 1
 AC 25000,25000,25000,25000,10000,10000,10000,10000
 DC 25000,25000,25000,25000,40000,40000,40000,40000
 SP 25000,25000,25000,25000,30000,30000,30000,30000
-XQ#HOME,1
+HOMERUN=0
 #LOOPER
 JP#LOOPER
 EN
@@ -53,6 +53,9 @@ DCD=OLDDCD
 ENDIF
 RE
 #HOME
+IF (HOMERUN = 1)
+JP #ENDHOME
+ENDIF
 NOTE Move slit forward 10mm if it is against the reverse limit switch
 IF ((_TSE & 4) = 0)
 SHE
@@ -96,5 +99,7 @@ BGEFGH
 AMEFGH
 DP ,,,,0,0,0,0
 SP ,,,,30000,30000,30000,30000
+HOMERUN=1
+#ENDHOME
 EN