diff --git a/src/p_inter.c b/src/p_inter.c
index ba27dab63..f4a857845 100644
--- a/src/p_inter.c
+++ b/src/p_inter.c
@@ -581,18 +581,21 @@ void P_TouchSpecialThing(mobj_t *special, mobj_t *toucher, boolean heightcheck)
 
 			P_AddPlayerScore(player, 1000);
 
-			if (ALL7EMERALDS(emeralds)) // Got all 7
+			if (!modeattacking) // score only there...
 			{
-				if (!(netgame || multiplayer))
+				if (ALL7EMERALDS(emeralds)) // Got all 7
 				{
-					player->continues += 1;
-					players->gotcontinue = true;
-					if (P_IsLocalPlayer(player))
-						S_StartSound(NULL, sfx_s3kac);
+					if (!(netgame || multiplayer))
+					{
+						player->continues += 1;
+						players->gotcontinue = true;
+						if (P_IsLocalPlayer(player))
+							S_StartSound(NULL, sfx_s3kac);
+					}
 				}
+				else
+					token++;
 			}
-			else
-				token++;
 			break;
 
 		// Emerald Hunt
diff --git a/src/p_mobj.c b/src/p_mobj.c
index ad6bd4365..a6e65603d 100644
--- a/src/p_mobj.c
+++ b/src/p_mobj.c
@@ -9503,10 +9503,6 @@ void P_SpawnMapThing(mapthing_t *mthing)
 		if (i == MT_STARPOST)
 			return;
 
-		// Emerald Tokens -->> Score Tokens
-		else if (i == MT_TOKEN)
-			return; /// \todo
-
 		// 1UPs -->> Score TVs
 		else if (i == MT_1UP_BOX) // 1UP
 		{