diff --git a/src/main/java/com/massivecraft/factions/cmd/CmdMapHeight.java b/src/main/java/com/massivecraft/factions/cmd/CmdMapHeight.java
index 648061c1..7563f63e 100644
--- a/src/main/java/com/massivecraft/factions/cmd/CmdMapHeight.java
+++ b/src/main/java/com/massivecraft/factions/cmd/CmdMapHeight.java
@@ -28,7 +28,7 @@ public class CmdMapHeight extends FCommand {
         int height = argAsInt(0);
 
         fme.setMapHeight(height);
-        fme.sendMessage(TL.COMMAND_MAPHEIGHT_SET.format(height));
+        fme.sendMessage(TL.COMMAND_MAPHEIGHT_SET.format(fme.getMapHeight()));
     }
 
     @Override
diff --git a/src/main/java/com/massivecraft/factions/zcore/persist/MemoryFPlayer.java b/src/main/java/com/massivecraft/factions/zcore/persist/MemoryFPlayer.java
index 8952985c..a199370a 100644
--- a/src/main/java/com/massivecraft/factions/zcore/persist/MemoryFPlayer.java
+++ b/src/main/java/com/massivecraft/factions/zcore/persist/MemoryFPlayer.java
@@ -921,7 +921,7 @@ public abstract class MemoryFPlayer implements FPlayer {
     }
 
     public void setMapHeight(int height) {
-        this.mapHeight = height;
+        this.mapHeight = height > Conf.mapHeight * 2 ? Conf.mapHeight * 2 : height;
     }
 
     public String getNameAndTitle(FPlayer fplayer) {