diff --git a/src/main/java/com/untamedears/JukeAlert/listener/JukeAlertListener.java b/src/main/java/com/untamedears/JukeAlert/listener/JukeAlertListener.java
index f43c74f1..4b7c228d 100644
--- a/src/main/java/com/untamedears/JukeAlert/listener/JukeAlertListener.java
+++ b/src/main/java/com/untamedears/JukeAlert/listener/JukeAlertListener.java
@@ -477,7 +477,7 @@ public void enterSnitchProximity(PlayerMoveEvent event) {
 				}
 				return;
 			}
-			handleSnitchEntry(player);
+			handleSnitchEntry(player, null);
 		} catch (NullPointerException npe) {
 			if (System.currentTimeMillis() - lastNotifyMoveFailure > failureReportDelay) {
 				JukeAlert.getInstance().getLogger().log(Level.SEVERE, "MoveEvent generated an NPE", npe);
@@ -500,10 +500,11 @@ public void onVehicleMovement(VehicleMoveEvent event) {
 	public void onPlayerTeleport(PlayerTeleportEvent event) {
 
 		Player player = event.getPlayer();
-		handleSnitchEntry(player);
+		handleSnitchEntry(player, null);
+		handleSnitchEntry(player, event.getTo());
 	}
 
-	private void handleSnitchEntry(Player player) {
+	private void handleSnitchEntry(Player player, Location overrideLocation) {
 
 		if (player.hasMetadata("NPC")) {
 			return;
@@ -513,7 +514,7 @@ private void handleSnitchEntry(Player player) {
 			return;
 		}
 		UUID accountId = player.getUniqueId();
-		Location location = player.getLocation();
+		Location location = (overrideLocation == null ? player.getLocation() : overrideLocation);
 		World world = location.getWorld();
 		Set<Snitch> inList = playersInSnitches.get(accountId);
 		if (inList == null) {