diff --git a/src/main/java/com/gmail/nossr50/party/commands/PartyCommand.java b/src/main/java/com/gmail/nossr50/party/commands/PartyCommand.java
index 4094e1f79..c57ee621d 100644
--- a/src/main/java/com/gmail/nossr50/party/commands/PartyCommand.java
+++ b/src/main/java/com/gmail/nossr50/party/commands/PartyCommand.java
@@ -171,6 +171,11 @@ public class PartyCommand implements CommandExecutor {
                 return false;
             }
 
+            if (player.equals(target)) {
+                player.sendMessage(LocaleLoader.getString("Party.Join.Self"));
+                return true;
+            }
+
             String password = null;
             
             if(args.length > 2) {