diff --git a/extras/conf/udb/Includes/SRB222_things.cfg b/extras/conf/udb/Includes/SRB222_things.cfg
index 1de661e29643d303acb08b961fc564f083aae2b5..b4508c91ea568aecc702ad1bf9927f079e820bd1 100644
--- a/extras/conf/udb/Includes/SRB222_things.cfg
+++ b/extras/conf/udb/Includes/SRB222_things.cfg
@@ -4546,7 +4546,7 @@ udmf
 			sprite = "EMBMA0";
 			width = 16;
 			height = 30;
-			arg0
+			arg1
 			{
 				title = "Float?";
 				type = 11;
diff --git a/src/p_mobj.c b/src/p_mobj.c
index 635d4f42b69cdac7e8e400394a16d1e3fb154cbf..412ef7ddb43541dcf3ecbc60b344cfa66ac9ddf6 100644
--- a/src/p_mobj.c
+++ b/src/p_mobj.c
@@ -11849,7 +11849,6 @@ fixed_t P_GetMapThingSpawnHeight(const mobjtype_t mobjtype, const mapthing_t* mt
 	case MT_EMERHUNT:
 	case MT_EMERALDSPAWN:
 	case MT_TOKEN:
-	case MT_EMBLEM:
 	case MT_RING:
 	case MT_REDTEAMRING:
 	case MT_BLUETEAMRING:
@@ -11861,6 +11860,10 @@ fixed_t P_GetMapThingSpawnHeight(const mobjtype_t mobjtype, const mapthing_t* mt
 		offset += mthing->args[0] ? 0 : 24*FRACUNIT;
 		break;
 
+	case MT_EMBLEM:
+		offset += mthing->args[1] ? 0 : 24 * FRACUNIT;
+		break;
+
 	// Remaining objects.
 	default:
 		if (P_WeaponOrPanel(mobjtype))
diff --git a/src/p_setup.c b/src/p_setup.c
index 0330ea1e55c40d421ff020482dee14abcf78b8b9..c84b1ac78b9d6a2be0853d168349d7f9d66acbfb 100644
--- a/src/p_setup.c
+++ b/src/p_setup.c
@@ -6308,7 +6308,6 @@ static void P_ConvertBinaryThingTypes(void)
 		case 312: //Emerald token
 		case 320: //Emerald hunt location
 		case 321: //Match chaos emerald spawn
-		case 322: //Emblem
 		case 330: //Bounce ring panel
 		case 331: //Rail ring panel
 		case 332: //Automatic ring panel
@@ -6321,6 +6320,9 @@ static void P_ConvertBinaryThingTypes(void)
 		case 1800: //Coin
 			mapthings[i].args[0] = !(mapthings[i].options & MTF_AMBUSH);
 			break;
+		case 322: //Emblem
+			mapthings[i].args[1] = !(mapthings[i].options & MTF_AMBUSH);
+			break;
 		case 409: //Extra life monitor
 			mapthings[i].args[2] = !(mapthings[i].options & (MTF_AMBUSH|MTF_OBJECTSPECIAL));
 			break;