diff --git a/src/main/java/dev/plex/services/ServiceManager.java b/src/main/java/dev/plex/services/ServiceManager.java
index 90516eb..0faf424 100644
--- a/src/main/java/dev/plex/services/ServiceManager.java
+++ b/src/main/java/dev/plex/services/ServiceManager.java
@@ -20,7 +20,7 @@ public class ServiceManager
         registerService(new BanService());
         registerService(new GameRuleService());
         registerService(new UpdateCheckerService());
-        if (Plex.get().config.getBoolean("autowipe.enabled")) registerService(new AutoWipeService());
+        registerService(new AutoWipeService());
     }
 
     public void startServices()
diff --git a/src/main/java/dev/plex/services/impl/AutoWipeService.java b/src/main/java/dev/plex/services/impl/AutoWipeService.java
index 4a6fe28..aff79b5 100644
--- a/src/main/java/dev/plex/services/impl/AutoWipeService.java
+++ b/src/main/java/dev/plex/services/impl/AutoWipeService.java
@@ -1,5 +1,6 @@
 package dev.plex.services.impl;
 
+import dev.plex.Plex;
 import dev.plex.services.AbstractService;
 import org.bukkit.Bukkit;
 import org.bukkit.World;
@@ -18,15 +19,18 @@ public class AutoWipeService extends AbstractService
     @Override
     public void run()
     {
-        List<String> entities = plugin.config.getStringList("autowipe.entities");
-
-        for (World world : Bukkit.getWorlds())
+        if (Plex.get().config.getBoolean("autowipe.enabled"))
         {
-            for (Entity entity : world.getEntities())
+            List<String> entities = plugin.config.getStringList("autowipe.entities");
+
+            for (World world : Bukkit.getWorlds())
             {
-                if (entities.stream().anyMatch(entityName -> entityName.equalsIgnoreCase(entity.getType().name())))
+                for (Entity entity : world.getEntities())
                 {
-                    entity.remove();
+                    if (entities.stream().anyMatch(entityName -> entityName.equalsIgnoreCase(entity.getType().name())))
+                    {
+                        entity.remove();
+                    }
                 }
             }
         }