diff --git a/resources/[managers]/mapmanager/mapmanager_server.lua b/resources/[managers]/mapmanager/mapmanager_server.lua
index cd0f418..cb8cd21 100644
--- a/resources/[managers]/mapmanager/mapmanager_server.lua
+++ b/resources/[managers]/mapmanager/mapmanager_server.lua
@@ -156,11 +156,20 @@ local function handleRoundEnd()
 		if data.gameTypes[currentGameType] then
 			table.insert(possibleMaps, map)
 		end
-	end
+    end
 
-	if #possibleMaps > 0 then
-		local rnd = math.random(#possibleMaps)
-		changeMap(possibleMaps[rnd])
+    if #possibleMaps > 1 then
+        local mapname = currentMap
+
+        while mapname == currentMap do
+            local rnd = math.random(#possibleMaps)
+            mapname = possibleMaps[rnd]
+        end
+
+        changeMap(mapname)
+    elseif #possibleMaps > 0 then
+        local rnd = math.random(#possibleMaps)
+        changeMap(possibleMaps[rnd])
 	end
 end