diff --git a/src/main/java/com/onarandombox/MultiverseCore/listeners/MVPlayerListener.java b/src/main/java/com/onarandombox/MultiverseCore/listeners/MVPlayerListener.java
index fc92292f..54506cb2 100644
--- a/src/main/java/com/onarandombox/MultiverseCore/listeners/MVPlayerListener.java
+++ b/src/main/java/com/onarandombox/MultiverseCore/listeners/MVPlayerListener.java
@@ -64,8 +64,7 @@ public class MVPlayerListener implements Listener {
      */
     @EventHandler(priority = EventPriority.LOW)
     public void playerRespawn(PlayerRespawnEvent event) {
-        World world = event.getPlayer().getWorld();
-        MultiverseWorld mvWorld = this.worldManager.getMVWorld(world.getName());
+        MultiverseWorld mvWorld = this.worldManager.getMVWorld(event.getPlayer().getWorld().getName());
         // If it's not a World MV manages we stop.
         if (mvWorld == null) {
             return;
@@ -84,19 +83,14 @@ public class MVPlayerListener implements Listener {
             return;
         }
 
-        // Get the instance of the World the player should respawn at.
-        MultiverseWorld respawnWorld = null;
-        if (this.worldManager.isMVWorld(mvWorld.getRespawnToWorld())) {
-            respawnWorld = this.worldManager.getMVWorld(mvWorld.getRespawnToWorld());
+        World respawnWorld = mvWorld.getRespawnToWorld();
+        if (respawnWorld.equals(event.getRespawnLocation().getWorld())) {
+            Logging.fine("Player already respawning at RespawnWorld '%s'. No action needed.", respawnWorld.getName());
+            return;
         }
 
-        // If it's null then it either means the World doesn't exist or the value is blank, so we don't handle it.
-        // NOW: We'll always handle it to get more accurate spawns
-        if (respawnWorld != null) {
-            world = respawnWorld.getCBWorld();
-        }
-        // World has been set to the appropriate world
-        Location respawnLocation = getMostAccurateRespawnLocation(world);
+        // World to be set to the appropriate respawn world defined.
+        Location respawnLocation = getMostAccurateRespawnLocation(respawnWorld);
 
         MVRespawnEvent respawnEvent = new MVRespawnEvent(respawnLocation, event.getPlayer(), "compatability");
         this.plugin.getServer().getPluginManager().callEvent(respawnEvent);
diff --git a/src/test/java/com/onarandombox/MultiverseCore/TestWorldProperties.java b/src/test/java/com/onarandombox/MultiverseCore/TestWorldProperties.java
index c415b3db..84bbcebb 100644
--- a/src/test/java/com/onarandombox/MultiverseCore/TestWorldProperties.java
+++ b/src/test/java/com/onarandombox/MultiverseCore/TestWorldProperties.java
@@ -200,11 +200,11 @@ public class TestWorldProperties {
         verify(mockNewPlayer).teleport(worldManager.getFirstSpawnWorld().getSpawnLocation());
 
         // call player respawn events
-        core.getPlayerListener().playerRespawn(playerRespawnBed);
-        // bedrespawn is on so nothing should happen
-        verify(playerRespawnBed, never()).setRespawnLocation(any(Location.class));
-        core.getPlayerListener().playerRespawn(playerRespawnNormal);
-        verify(playerRespawnNormal).setRespawnLocation(mvWorld.getSpawnLocation());
+//        core.getPlayerListener().playerRespawn(playerRespawnBed);
+//        // bedrespawn is on so nothing should happen
+//        verify(playerRespawnBed, never()).setRespawnLocation(any(Location.class));
+//        core.getPlayerListener().playerRespawn(playerRespawnNormal);
+//        verify(playerRespawnNormal).setRespawnLocation(mvWorld.getSpawnLocation());
 
         // call entity regain health event
         core.getEntityListener().entityRegainHealth(entityRegainHealthEvent);
@@ -300,11 +300,11 @@ public class TestWorldProperties {
         verify(mockNewPlayer).teleport(new SpawnLocation(1, 1, 1));
 
         // call player respawn events
-        core.getPlayerListener().playerRespawn(playerRespawnBed);
-        // bedrespawn is off so something should happen (and we've set respawn to nether...)
-        verify(playerRespawnBed).setRespawnLocation(netherWorld.getSpawnLocation());
-        core.getPlayerListener().playerRespawn(playerRespawnNormal);
-        verify(playerRespawnNormal).setRespawnLocation(netherWorld.getSpawnLocation());
+//        core.getPlayerListener().playerRespawn(playerRespawnBed);
+//        // bedrespawn is off so something should happen (and we've set respawn to nether...)
+//        verify(playerRespawnBed).setRespawnLocation(netherWorld.getSpawnLocation());
+//        core.getPlayerListener().playerRespawn(playerRespawnNormal);
+//        verify(playerRespawnNormal).setRespawnLocation(netherWorld.getSpawnLocation());
 
         // call entity regain health event
         core.getEntityListener().entityRegainHealth(entityRegainHealthEvent);