diff --git a/mapchooser_extended/scripting/mapchooser_extended.sp b/mapchooser_extended/scripting/mapchooser_extended.sp
index 7d711f93..9561984d 100644
--- a/mapchooser_extended/scripting/mapchooser_extended.sp
+++ b/mapchooser_extended/scripting/mapchooser_extended.sp
@@ -1689,8 +1689,11 @@ void CreateNextVote()
 			b = GetRandomInt(0, GetArraySize(tempMaps) - 1);
 			GetArrayString(tempMaps, b, map, PLATFORM_MAX_PATH);
 
-			if(InternalGetMapPlayerRestriction(map) == 0)
-				break;
+			if(InternalGetMapTimeRestriction(map) != 0)
+				continue;
+
+			if(InternalGetMapPlayerRestriction(map) != 0)
+				continue;
 
 			bool okay = true;