diff --git a/src/main/java/me/firephoenix/ps3minigames/listener/JoinQuitListener.java b/src/main/java/me/firephoenix/ps3minigames/listener/JoinQuitListener.java
index f8d81a2..e8c43ca 100644
--- a/src/main/java/me/firephoenix/ps3minigames/listener/JoinQuitListener.java
+++ b/src/main/java/me/firephoenix/ps3minigames/listener/JoinQuitListener.java
@@ -4,10 +4,7 @@ import me.firephoenix.ps3minigames.PS3Minigames;
 import me.firephoenix.ps3minigames.states.LobbyState;
 import me.firephoenix.ps3minigames.util.GameUtil;
 import me.firephoenix.ps3minigames.util.Timer;
-import org.bukkit.ChatColor;
-import org.bukkit.GameMode;
-import org.bukkit.Location;
-import org.bukkit.World;
+import org.bukkit.*;
 import org.bukkit.configuration.file.FileConfiguration;
 import org.bukkit.entity.Player;
 import org.bukkit.event.EventHandler;
@@ -39,6 +36,10 @@ public class JoinQuitListener implements Listener {
         player.setHealth(20);
         player.setFoodLevel(20);
         player.getInventory().clear();
+        player.getInventory().setBoots(null);
+        player.getInventory().setLeggings(null);
+        player.getInventory().setChestplate(null);
+        player.getInventory().setHelmet(null);
         player.setGameMode(GameMode.SURVIVAL);
 
         // Send all players which are in the lobby the join message
diff --git a/src/main/java/me/firephoenix/ps3minigames/util/GameUtil.java b/src/main/java/me/firephoenix/ps3minigames/util/GameUtil.java
index 6926591..fcbe84f 100644
--- a/src/main/java/me/firephoenix/ps3minigames/util/GameUtil.java
+++ b/src/main/java/me/firephoenix/ps3minigames/util/GameUtil.java
@@ -86,6 +86,10 @@ public class GameUtil {
             Bukkit.getServer().getPlayer(uuid).getActivePotionEffects().clear();
             Bukkit.getServer().getPlayer(uuid).setHealth(20);
             Bukkit.getServer().getPlayer(uuid).setFoodLevel(20);
+            Bukkit.getServer().getPlayer(uuid).getInventory().setBoots(null);
+            Bukkit.getServer().getPlayer(uuid).getInventory().setLeggings(null);
+            Bukkit.getServer().getPlayer(uuid).getInventory().setChestplate(null);
+            Bukkit.getServer().getPlayer(uuid).getInventory().setHelmet(null);
             PS3Minigames.INSTANCE.getFrozenPlayer().remove(uuid);
         });
         if (game.getMap().getPlayers().size() == 0) {