diff --git a/src/me/libraryaddict/disguise/DisguiseConfig.java b/src/me/libraryaddict/disguise/DisguiseConfig.java
index de821698..b301e73e 100644
--- a/src/me/libraryaddict/disguise/DisguiseConfig.java
+++ b/src/me/libraryaddict/disguise/DisguiseConfig.java
@@ -83,6 +83,7 @@ public class DisguiseConfig {
         setDisguiseEntityExpire(config.getInt("DisguiseEntityExpire"));
         setDisguiseCloneExpire(config.getInt("DisguiseCloneExpire"));
         setMaxClonedDisguises(config.getInt("DisguiseCloneSize"));
+        setUnusedDisguisesRemoved(config.getBoolean("RemoveUnusedDisguises"));
     }
 
     public static boolean isAnimationPacketsEnabled() {
diff --git a/src/me/libraryaddict/disguise/DisguiseListener.java b/src/me/libraryaddict/disguise/DisguiseListener.java
index 4cd5e728..00c9faa0 100644
--- a/src/me/libraryaddict/disguise/DisguiseListener.java
+++ b/src/me/libraryaddict/disguise/DisguiseListener.java
@@ -105,7 +105,8 @@ public class DisguiseListener implements Listener {
     public void onQuit(PlayerQuitEvent event) {
         if (DisguiseConfig.isUnusedDisguisesRemoved()) {
             for (TargetedDisguise disguise : DisguiseUtilities.getSeenDisguises(event.getPlayer().getName())) {
-                disguise.removeDisguise();
+                // TODO fix
+                // disguise.removeDisguise();
             }
         }
     }