diff --git a/src/main/java/com/zixiken/dimdoors/shared/RiftRegistry.java b/src/main/java/com/zixiken/dimdoors/shared/RiftRegistry.java
index dc8fff7c..a415de58 100644
--- a/src/main/java/com/zixiken/dimdoors/shared/RiftRegistry.java
+++ b/src/main/java/com/zixiken/dimdoors/shared/RiftRegistry.java
@@ -121,6 +121,6 @@ public class RiftRegistry {
     }
 
     public void teleportEntityToRift(Entity entity, int pairedRiftID) {
-        TeleportHelper.teleport(entity, getRiftLocation(pairedRiftID));
+        TeleportHelper.teleport(entity, ((DDTileEntityBase) getRiftLocation(pairedRiftID).getTileEntity()).getTeleportTarget());
     }
 }
diff --git a/src/main/java/com/zixiken/dimdoors/tileentities/TileEntityDimDoor.java b/src/main/java/com/zixiken/dimdoors/tileentities/TileEntityDimDoor.java
index 3beb516c..b8697311 100644
--- a/src/main/java/com/zixiken/dimdoors/tileentities/TileEntityDimDoor.java
+++ b/src/main/java/com/zixiken/dimdoors/tileentities/TileEntityDimDoor.java
@@ -1,5 +1,7 @@
 package com.zixiken.dimdoors.tileentities;
 
+import com.zixiken.dimdoors.blocks.BlockDimDoor;
+import com.zixiken.dimdoors.shared.Location;
 import com.zixiken.dimdoors.shared.RiftRegistry;
 import java.util.Random;
 import net.minecraft.entity.Entity;
@@ -57,12 +59,12 @@ public class TileEntityDimDoor extends DDTileEntityBase {
         return rgbaColor;
     }
 
-    /*@Override
+    @Override
     public Location getTeleportTarget() {
         EnumFacing facing = getWorld().getBlockState(getPos()).getValue(BlockDimDoor.FACING);
 
         return new Location(world, pos.offset(facing));
-    }*/
+    }
 
     @Override
     public boolean tryTeleport(Entity entity) {