diff --git a/af/lockandkey.af b/af/lockandkey.af
index f388b2e..331c565 100644
--- a/af/lockandkey.af
+++ b/af/lockandkey.af
@@ -51,7 +51,6 @@ STATE: {idle}
 	IF:	Always
 		DO:	DoAll
 				Chat {/vt opt set enablebuffing false}
-				Chat {/ub equip load idle.utl}
 				DoExpr {setcombatstate[`peace`]}
 				DoExpr {clearvar[queuePrimary]}
 				DoExpr {clearvar[queueSecondary]}
@@ -286,7 +285,7 @@ STATE: {service_bella_turn_in_jaw}
 		DO:	DoAll
 				Chat {/a [bella] jaw turned in, returning home (partial bella)}
 				DoExpr {setvar[bellaTurnInAttempts, 0]}
-				SetState {service_reset_main}
+				SetState {equip_idle}
 	IF:	All
 			SecsInStateGE 300
 			ItemCountGE 1 {Insatiable Eater Jaw}
@@ -305,7 +304,7 @@ STATE: {service_bella_turn_in_jaw}
 	IF:	SecsInStateGE 300
 		DO:	DoAll
 				DoExpr {setvar[bellaTurnInAttempts, 0]}
-				SetState {service_reset_main}
+				SetState {equip_idle}
 
 STATE: {service_bella_backoff}
 ~~ Disable bella services for 24h, return home
@@ -319,7 +318,16 @@ STATE: {service_bella_backoff}
 				DoExpr {setvar[bellaJawRunRecoverAttempts, 0]}
 				DoExpr {setvar[bellaBackoffClock,stopwatchcreate[]]}
 				DoExpr {stopwatchstart[getvar[bellaBackoffClock]]}
-				SetState {service_reset_main}
+				SetState {equip_idle}
+
+STATE: {equip_idle}
+~~ Swap back to idle gear before heading home
+	IF:	Death
+		DO:	SetState {death}
+	IF:	Always
+		DO:	Chat {/ub equip load idle.utl}
+	IF:	SecsInStateGE 12
+		DO:	SetState {service_reset_main}
 
 STATE: {service_reset_main}
 ~~ Clear service vars, load ah_recall to return home, then go to idle
diff --git a/met/lockandkey.met b/met/lockandkey.met
index be18330..7e6e254 100644
--- a/met/lockandkey.met
+++ b/met/lockandkey.met
@@ -11,7 +11,7 @@ n
 n
 n
 n
-75
+78
 i
 21
 i
@@ -354,16 +354,12 @@ K
 V
 n
 n
-5
+4
 i
 2
 s
 /vt opt set enablebuffing false
 i
-2
-s
-/ub equip load idle.utl
-i
 7
 TABLE
 2
@@ -2032,7 +2028,7 @@ setvar[bellaTurnInAttempts, 0]
 i
 1
 s
-service_reset_main
+equip_idle
 s
 service_bella_turn_in_jaw
 i
@@ -2201,7 +2197,7 @@ setvar[bellaTurnInAttempts, 0]
 i
 1
 s
-service_reset_main
+equip_idle
 s
 service_bella_turn_in_jaw
 i
@@ -2297,7 +2293,7 @@ stopwatchstart[getvar[bellaBackoffClock]]
 i
 1
 s
-service_reset_main
+equip_idle
 s
 service_bella_backoff
 i
@@ -2309,6 +2305,36 @@ i
 s
 death
 s
+equip_idle
+i
+1
+i
+2
+i
+0
+s
+/ub equip load idle.utl
+s
+equip_idle
+i
+6
+i
+1
+i
+12
+s
+service_reset_main
+s
+equip_idle
+i
+8
+i
+1
+i
+0
+s
+death
+s
 service_reset_main
 i
 1