diff --git a/src/org/mcteam/factions/Conf.java b/src/org/mcteam/factions/Conf.java
index 64d86743..0e23c9de 100644
--- a/src/org/mcteam/factions/Conf.java
+++ b/src/org/mcteam/factions/Conf.java
@@ -62,6 +62,7 @@ public class Conf {
 	public static boolean homesEnabled = true;
 	public static boolean homesMustBeInClaimedTerritory = true;
 	public static boolean homesTeleportToOnDeath = true;
+	public static boolean homesRespawnFromNoPowerLossWorlds = true;
 	public static boolean homesTeleportCommandEnabled = true;
 	public static boolean homesTeleportAllowedFromEnemyTerritory = true;
 	public static double homesTeleportAllowedEnemyDistance = 32;
diff --git a/src/org/mcteam/factions/listeners/FactionsPlayerListener.java b/src/org/mcteam/factions/listeners/FactionsPlayerListener.java
index 23505b6d..89e90b43 100644
--- a/src/org/mcteam/factions/listeners/FactionsPlayerListener.java
+++ b/src/org/mcteam/factions/listeners/FactionsPlayerListener.java
@@ -334,7 +334,9 @@ public class FactionsPlayerListener extends PlayerListener{
 	public void onPlayerRespawn(PlayerRespawnEvent event) {
 		FPlayer me = FPlayer.get(event.getPlayer());
 		Location home = me.getFaction().getHome();
-		if (Conf.homesEnabled && Conf.homesTeleportToOnDeath && home != null && !Conf.worldsNoPowerLoss.contains(event.getPlayer().getWorld().getName())) {
+		if (	Conf.homesEnabled && Conf.homesTeleportToOnDeath && home != null &&
+				(Conf.homesRespawnFromNoPowerLossWorlds || !Conf.worldsNoPowerLoss.contains(event.getPlayer().getWorld().getName()))
+			) {
 			event.setRespawnLocation(home);
 		}
 	}