diff --git a/ChestsPlusPlus_Main/src/main/java/com/jamesdpeters/minecraft/chests/ChestsPlusPlus.java b/ChestsPlusPlus_Main/src/main/java/com/jamesdpeters/minecraft/chests/ChestsPlusPlus.java
index 6fae3e1..c1847f9 100644
--- a/ChestsPlusPlus_Main/src/main/java/com/jamesdpeters/minecraft/chests/ChestsPlusPlus.java
+++ b/ChestsPlusPlus_Main/src/main/java/com/jamesdpeters/minecraft/chests/ChestsPlusPlus.java
@@ -28,6 +28,7 @@ import fr.minuskube.inv.InventoryManager;
 import org.bstats.bukkit.Metrics;
 import org.bukkit.Bukkit;
 import org.bukkit.ChatColor;
+import org.bukkit.Chunk;
 import org.bukkit.configuration.serialization.ConfigurationSerialization;
 import org.bukkit.permissions.PermissionDefault;
 import org.bukkit.plugin.java.JavaPlugin;
@@ -127,6 +128,9 @@ public class ChestsPlusPlus extends JavaPlugin {
             new Config();
             getLogger().info("Chests++ Successfully Loaded Config and Recipes");
 
+            // Remove armour stands if disabled
+            Utils.fixEntities();
+
             //Register event listeners
             getServer().getPluginManager().registerEvents(new StorageListener(), this);
             getServer().getPluginManager().registerEvents(new InventoryListener(), this);