diff --git a/Changelog.txt b/Changelog.txt
index eadc22fe3..02eeb9299 100644
--- a/Changelog.txt
+++ b/Changelog.txt
@@ -13,6 +13,7 @@ Version 1.3.06-dev
  + Added API functions for admin & party chat
  + Added Iron Grip skill to Unarmed which gives players an chance to keep from being disarmed.
  + Added some new languages to the locale files.
+ = Fixed exploit where you could teleport to yourself with PTP to prevent things like fall damage
  = Fixed NPE error with Metrics on startup
  = Fixed bug where Herbalism required double drops permission to give XP
  = Fixed bug where {0} would be displayed in front of your power level in mcstats
diff --git a/src/main/java/com/gmail/nossr50/commands/party/PtpCommand.java b/src/main/java/com/gmail/nossr50/commands/party/PtpCommand.java
index 3228f4a76..1013e9fe3 100644
--- a/src/main/java/com/gmail/nossr50/commands/party/PtpCommand.java
+++ b/src/main/java/com/gmail/nossr50/commands/party/PtpCommand.java
@@ -53,6 +53,7 @@ public class PtpCommand implements CommandExecutor {
 
             if (player.equals(target)) {
                 player.sendMessage("You can't teleport to yourself!"); //TODO: Use locale
+                return true;
             }
 
             if (target == null) {