diff --git a/src/p_mobj.c b/src/p_mobj.c
index aa43a9d93..c4c9b12b3 100644
--- a/src/p_mobj.c
+++ b/src/p_mobj.c
@@ -12569,7 +12569,7 @@ static boolean P_SetupSpawnedMapThing(mapthing_t *mthing, mobj_t *mobj, boolean
 		}
 
 		// Steer away instead of towards
-		if (mthing->options & MTF_AMBUSH)
+		if (mthing->args[2])
 		{
 			mobj->extravalue1 = 0;
 		}
diff --git a/src/p_setup.c b/src/p_setup.c
index 877168bdd..61120d54d 100644
--- a/src/p_setup.c
+++ b/src/p_setup.c
@@ -6549,6 +6549,7 @@ static void P_ConvertBinaryThingTypes(void)
 		case 2004: // MT_BOTHINT
 			mapthings[i].args[0] = mapthings[i].angle;
 			mapthings[i].args[1] = mapthings[i].extrainfo;
+			mapthings[i].args[2] = !!(mapthings[i].options & MTF_AMBUSH);
 			break;
 		case 2010: // MT_ITEMCAPSULE
 			mapthings[i].args[0] = mapthings[i].angle;