diff --git a/mapvote/mapvote.gsc b/mapvote/mapvote.gsc
index a568ee1..bd8de46 100644
Binary files a/mapvote/mapvote.gsc and b/mapvote/mapvote.gsc differ
diff --git a/mapvote/source/mapvote-source.gsc b/mapvote/source/mapvote-source.gsc
index 1dda25a..99cc173 100644
--- a/mapvote/source/mapvote-source.gsc
+++ b/mapvote/source/mapvote-source.gsc
@@ -281,6 +281,22 @@ ListenForVoteInputs()
     }
 }
 
+OnPlayerDisconnect()
+{
+    self waittill("disconnect");
+
+    if (self.mapvote["map"]["selected_index"] != -1)
+    {
+        level.mapvote["vote"]["maps"][self.mapvote["map"]["selected_index"]] = (level.mapvote["vote"]["maps"][self.mapvote["map"]["selected_index"]] - 1);
+        level.mapvote["hud"]["maps"][self.mapvote["map"]["selected_index"]] SetValue(level.mapvote["vote"]["maps"][self.mapvote["map"]["selected_index"]]);
+    }
+
+    if (self.mapvote["mode"]["selected_index"] != -1)
+    {
+        level.mapvote["vote"]["modes"][self.mapvote["mode"]["selected_index"]] = (level.mapvote["vote"]["modes"][self.mapvote["mode"]["selected_index"]] - 1);
+        level.mapvote["hud"]["modes"][self.mapvote["mode"]["selected_index"]] SetValue(level.mapvote["vote"]["modes"][self.mapvote["mode"]["selected_index"]]);
+    }
+}
 
 
 /* Vote section */
@@ -444,6 +460,7 @@ StartVote()
         player SetBlur(GetDvarInt("mapvote_blur_level"), GetDvarInt("mapvote_blur_fade_in_time"));
 
         player thread ListenForVoteInputs();
+        player thread OnPlayerDisconnect();
     }
 }