diff --git a/src/main/java/bentobox/addon/limits/commands/LimitPanel.java b/src/main/java/bentobox/addon/limits/commands/LimitPanel.java
index ef7c48f..593e9ae 100644
--- a/src/main/java/bentobox/addon/limits/commands/LimitPanel.java
+++ b/src/main/java/bentobox/addon/limits/commands/LimitPanel.java
@@ -94,7 +94,7 @@ public class LimitPanel {
         }
         IslandBlockCount ibc = addon.getBlockLimitListener().getIsland(island.getUniqueId());
         Map<Material, Integer> matLimits = addon.getBlockLimitListener().getMaterialLimits(world, island.getUniqueId());
-        if (matLimits.isEmpty()) {
+        if (matLimits.isEmpty() && addon.getSettings().getLimits().isEmpty()) {
             user.sendMessage("island.limits.no-limits");
             return;
         }
diff --git a/src/main/java/bentobox/addon/limits/listeners/BlockLimitsListener.java b/src/main/java/bentobox/addon/limits/listeners/BlockLimitsListener.java
index f6067e5..c932a98 100644
--- a/src/main/java/bentobox/addon/limits/listeners/BlockLimitsListener.java
+++ b/src/main/java/bentobox/addon/limits/listeners/BlockLimitsListener.java
@@ -173,7 +173,7 @@ public class BlockLimitsListener implements Listener {
 
     private void notify(Cancellable e, User user, int limit, Material m) {
         if (limit > -1) {
-            user.sendMessage("limits.hit-limit",
+            user.sendMessage("block-limits.hit-limit",
                     "[material]", Util.prettifyText(m.toString()),
                     TextVariables.NUMBER, String.valueOf(limit));
             e.setCancelled(true);
diff --git a/src/main/java/bentobox/addon/limits/listeners/EntityLimitListener.java b/src/main/java/bentobox/addon/limits/listeners/EntityLimitListener.java
index 7e2d9e5..4bca9ff 100644
--- a/src/main/java/bentobox/addon/limits/listeners/EntityLimitListener.java
+++ b/src/main/java/bentobox/addon/limits/listeners/EntityLimitListener.java
@@ -53,7 +53,7 @@ public class EntityLimitListener implements Listener {
                             for (Entity ent : e.getVehicle().getLocation().getWorld().getNearbyEntities(e.getVehicle().getLocation(), 5, 5, 5)) {
                                 if (ent instanceof Player) {
                                     ((Player) ent).updateInventory();
-                                    User.getInstance(ent).sendMessage("limits.hit-limit", "[material]",
+                                    User.getInstance(ent).sendMessage("entity-limits.hit-limit", "[entity]",
                                             Util.prettifyText(e.getVehicle().getType().toString())
                                             ,"[number]", String.valueOf(addon.getSettings().getLimits().get(e.getVehicle().getType())));
                                 }
@@ -116,7 +116,7 @@ public class EntityLimitListener implements Listener {
                 if (!e.getSpawnReason().equals(SpawnReason.SPAWNER)) {
                     for (Entity ent : e.getLocation().getWorld().getNearbyEntities(e.getLocation(), 5, 5, 5)) {
                         if (ent instanceof Player) {
-                            User.getInstance(ent).sendMessage("limits.hit-limit", "[material]",
+                            User.getInstance(ent).sendMessage("entity-limits.hit-limit", "[entity]",
                                     Util.prettifyText(e.getEntityType().toString()),
                                     "[number]", String.valueOf(addon.getSettings().getLimits().get(e.getEntityType())));
                         }
diff --git a/src/main/resources/locales/en-US.yml b/src/main/resources/locales/en-US.yml
index 8cd0490..fb4aa2e 100755
--- a/src/main/resources/locales/en-US.yml
+++ b/src/main/resources/locales/en-US.yml
@@ -4,7 +4,8 @@
 ###########################################################################################
 
 limits:
-  hit-limit: "&c[material] limited to [number]!"
+  entity-hit-limit: "&c[entity] spawning limited to [number]!"
+  block-hit-limit: "&c[material] limited to [number]!"
   panel-title: "Island limits"
 
 admin:
@@ -26,4 +27,4 @@ island:
     block-limit-syntax: "[number]/[limit]"
     no-limits: "&cNo limits set in this world"
 
-    
\ No newline at end of file
+