diff --git a/plugins/mapchooser.sp b/plugins/mapchooser.sp
index 743e557c..9f7b72f0 100644
--- a/plugins/mapchooser.sp
+++ b/plugins/mapchooser.sp
@@ -884,7 +884,8 @@ NominateResult:InternalNominateMap(String:map[], bool:force, owner)
 	
 	new index;
 
-	if ((index = FindValueInArray(g_NominateOwners, owner)) != -1)
+	/* Look to replace an existing nomination by this client - Nominations made with owner = 0 aren't replaced */
+	if (owner && ((index = FindValueInArray(g_NominateOwners, owner)) != -1))
 	{
 		new String:oldmap[33];
 		GetArrayString(g_NominateList, index, oldmap, sizeof(oldmap));
@@ -893,7 +894,6 @@ NominateResult:InternalNominateMap(String:map[], bool:force, owner)
 		Call_PushCell(owner);
 		Call_Finish();
 		
-		
 		SetArrayString(g_NominateList, index, map);
 		return Nominate_Replaced;
 	}