diff --git a/galaxy/src/main/java/com/alttd/chat/nicknames/Nicknames.java b/galaxy/src/main/java/com/alttd/chat/nicknames/Nicknames.java
index 5fd7334..78d1ea6 100644
--- a/galaxy/src/main/java/com/alttd/chat/nicknames/Nicknames.java
+++ b/galaxy/src/main/java/com/alttd/chat/nicknames/Nicknames.java
@@ -277,7 +277,7 @@ public class Nicknames implements CommandExecutor, TabCompleter {
 
         } else if (NickUtilities.validNick(sender, target, nickName)) {
             if (target.isOnline()) {
-                setNick(target.getPlayer(), nickName);
+                setNick(target.getUniqueId(), nickName);
             } else {
                 NickUtilities.bungeeMessageHandled(target.getUniqueId(), sender, "Set");
             }
@@ -290,6 +290,7 @@ public class Nicknames implements CommandExecutor, TabCompleter {
                 Nick nick = NickCache.get(target.getUniqueId());
                 nick.setCurrentNick(nickName);
                 nick.setLastChangedDate(new Date().getTime());
+
             } else {
                 NickCache.put(target.getUniqueId(), new Nick(target.getUniqueId(), nickName, new Date().getTime()));
             }
@@ -379,8 +380,8 @@ public class Nicknames implements CommandExecutor, TabCompleter {
         return user.getNickNameString();
     }
 
-    public void setNick(final Player player, final String nickName) {
-        ChatUser user = ChatUserManager.getChatUser(player.getUniqueId());
+    public void setNick(final UUID uuid, final String nickName) {
+        ChatUser user = ChatUserManager.getChatUser(uuid);
         user.setDisplayName(nickName);
     }
 
diff --git a/galaxy/src/main/java/com/alttd/chat/nicknames/NicknamesEvents.java b/galaxy/src/main/java/com/alttd/chat/nicknames/NicknamesEvents.java
index 87588bc..fc6b7f8 100644
--- a/galaxy/src/main/java/com/alttd/chat/nicknames/NicknamesEvents.java
+++ b/galaxy/src/main/java/com/alttd/chat/nicknames/NicknamesEvents.java
@@ -60,7 +60,7 @@ public class NicknamesEvents implements Listener, PluginMessageListener {
                 if (nickName == null) {
                     Nicknames.getInstance().resetNick(player);
                 } else if (!nickName.equals(strippedNick)) {
-                    Nicknames.getInstance().setNick(player, nickName);
+                    Nicknames.getInstance().setNick(player.getUniqueId(), nickName);
                 }
 
                 Nicknames.getInstance().NickCache.put(e.getPlayer().getUniqueId(), nick);
@@ -130,7 +130,7 @@ public class NicknamesEvents implements Listener, PluginMessageListener {
                 if (offlinePlayer.isOnline()) {
                     Nick nick = Queries.getNick(playerUUID);
                     if (nick != null && nick.getCurrentNick() != null) {
-                        Nicknames.getInstance().setNick(offlinePlayer.getPlayer(), nick.getCurrentNick());
+                        Nicknames.getInstance().setNick(offlinePlayer.getUniqueId(), nick.getCurrentNick());
                     }
                 }
                 break;
@@ -148,7 +148,7 @@ public class NicknamesEvents implements Listener, PluginMessageListener {
                     Nick nick = Queries.getNick(playerUUID);
                     Player target = Bukkit.getPlayer(playerUUID);
                     if (target != null && nick != null && nick.getCurrentNick() != null) {
-                        Nicknames.getInstance().setNick(target, nick.getCurrentNick());
+                        Nicknames.getInstance().setNick(target.getUniqueId(), nick.getCurrentNick());
                         target.sendMessage(format(Config.NICK_CHANGED
                                 .replace("%nickname%", nick.getCurrentNick())));
                     }
diff --git a/galaxy/src/main/java/com/alttd/chat/nicknames/NicknamesGui.java b/galaxy/src/main/java/com/alttd/chat/nicknames/NicknamesGui.java
index 64ae7a0..3c95e5c 100644
--- a/galaxy/src/main/java/com/alttd/chat/nicknames/NicknamesGui.java
+++ b/galaxy/src/main/java/com/alttd/chat/nicknames/NicknamesGui.java
@@ -190,7 +190,7 @@ public class NicknamesGui implements Listener {
                                     .replace("%oldNick%", nick.getCurrentNick() == null ? clickedItem.getItemMeta().getDisplayName() : nick.getCurrentNick())));
 
                             if (owningPlayer.isOnline() && owningPlayer.getPlayer() != null) {
-                                Nicknames.getInstance().setNick(owningPlayer.getPlayer(), nick.getNewNick());
+                                Nicknames.getInstance().setNick(owningPlayer.getUniqueId(), nick.getNewNick());
                                 owningPlayer.getPlayer().sendMessage(format(Config.NICK_CHANGED
                                         .replace("%nickname%", nick.getNewNick())));
                             }
@@ -245,7 +245,7 @@ public class NicknamesGui implements Listener {
                             }
 
                             if (owningPlayer.isOnline() && owningPlayer.getPlayer() != null) {
-                                Nicknames.getInstance().setNick(owningPlayer.getPlayer(), nick.getCurrentNick() == null ? owningPlayer.getName() : nick.getCurrentNick());
+                                Nicknames.getInstance().setNick(owningPlayer.getUniqueId(), nick.getCurrentNick() == null ? owningPlayer.getName() : nick.getCurrentNick());
                                 owningPlayer.getPlayer().sendMessage(format(Config.NICK_NOT_CHANGED));
                             }