diff --git a/src/main/java/cz/muni/fi/pa165/icehockeymanager/services/PlayerServiceImpl.java b/src/main/java/cz/muni/fi/pa165/icehockeymanager/services/PlayerServiceImpl.java
index c97e71939cc803d47ea22a44ad503122228ad246..d5a460b05cba3065e248465ca924696fefdc469b 100644
--- a/src/main/java/cz/muni/fi/pa165/icehockeymanager/services/PlayerServiceImpl.java
+++ b/src/main/java/cz/muni/fi/pa165/icehockeymanager/services/PlayerServiceImpl.java
@@ -45,7 +45,7 @@ public class PlayerServiceImpl implements PlayerService {
 
     @Override
     public void removeTeamFromPlayer(Player player, Team team) {
-        if(!player.getTeam().equals(team)){
+        if(player.getTeam().isEmpty() || !player.getTeam().get().equals(team)){
             throw new PlayerNotInTeamException("Player not in this team");
         }
         player.setTeam(null);