diff --git a/Essentials/src/main/java/com/earth2me/essentials/commands/Commandsethome.java b/Essentials/src/main/java/com/earth2me/essentials/commands/Commandsethome.java
index 89cc2bee3..94626cec6 100644
--- a/Essentials/src/main/java/com/earth2me/essentials/commands/Commandsethome.java
+++ b/Essentials/src/main/java/com/earth2me/essentials/commands/Commandsethome.java
@@ -51,7 +51,7 @@ public class Commandsethome extends EssentialsCommand {
         }
 
         final Location location = user.getLocation();
-        if (!ess.getSettings().isTeleportSafetyEnabled() && LocationUtil.isBlockUnsafeForUser(usersHome, location.getWorld(), location.getBlockX(), location.getBlockY(), location.getBlockZ())) {
+        if ((!ess.getSettings().isTeleportSafetyEnabled() || !ess.getSettings().isForceDisableTeleportSafety()) && LocationUtil.isBlockUnsafeForUser(usersHome, location.getWorld(), location.getBlockX(), location.getBlockY(), location.getBlockZ())) {
             throw new Exception(tl("unsafeTeleportDestination", location.getWorld().getName(), location.getBlockX(), location.getBlockY(), location.getBlockZ()));
         }