diff --git a/src/p_mobj.c b/src/p_mobj.c
index 49dc1e992..1d7869812 100644
--- a/src/p_mobj.c
+++ b/src/p_mobj.c
@@ -12306,6 +12306,13 @@ static boolean P_SetupEmblem(mapthing_t *mthing, mobj_t *mobj)
 			return false;
 		}
 
+		// Signal that you are to behave like a follower
+		mobj->flags2 |= MF2_STRONGBOX;
+		if (followers[followerpick].mode == FOLLOWERMODE_GROUND)
+		{
+			mobj->flags &= ~(MF_NOGRAVITY|MF_NOCLIPHEIGHT);
+		}
+
 		// Set up data
 		Obj_AudienceInit(mobj, NULL, followerpick);
 		if (P_MobjWasRemoved(mobj))
@@ -12313,13 +12320,6 @@ static boolean P_SetupEmblem(mapthing_t *mthing, mobj_t *mobj)
 			CONS_Alert(CONS_WARNING, "P_SetupEmblem: Follower \"%s\" causes emblem for map %d with tag %d to be removed immediately!\n", emblemlocations[j].stringVar2, gamemap, tagnum);
 			return false;
 		}
-
-		// Signal that you are to behave like a follower
-		mobj->flags2 |= MF2_STRONGBOX;
-		if (followers[followerpick].mode == FOLLOWERMODE_GROUND)
-		{
-			mobj->flags &= ~(MF_NOGRAVITY|MF_NOCLIPHEIGHT);
-		}
 	}
 
 	return true;