diff --git a/src/hdskins/java/com/voxelmodpack/hdskins/LocalTexture.java b/src/hdskins/java/com/voxelmodpack/hdskins/LocalTexture.java
index e843d46f..687da423 100644
--- a/src/hdskins/java/com/voxelmodpack/hdskins/LocalTexture.java
+++ b/src/hdskins/java/com/voxelmodpack/hdskins/LocalTexture.java
@@ -59,6 +59,10 @@ public class LocalTexture {
         return local != null;
     }
 
+    public boolean hasRemoteTexture() {
+        return hasRemote() && remote.isTextureUploaded() && getTexture() != blank.getBlankSkin(type);
+    }
+
     public boolean usingLocal() {
         return !hasRemote() && hasLocal();
     }
diff --git a/src/hdskins/java/com/voxelmodpack/hdskins/SkinUploader.java b/src/hdskins/java/com/voxelmodpack/hdskins/SkinUploader.java
index 4c158306..01f0f863 100644
--- a/src/hdskins/java/com/voxelmodpack/hdskins/SkinUploader.java
+++ b/src/hdskins/java/com/voxelmodpack/hdskins/SkinUploader.java
@@ -141,7 +141,7 @@ public class SkinUploader implements Closeable {
     }
 
     public boolean canClear() {
-        return !isOffline() && !hasStatus() && !downloadInProgress() && remotePlayer.isTextureSetupComplete();
+        return !isOffline() && !hasStatus() && !downloadInProgress() && remotePlayer.isUsingRemoteTexture();
     }
 
     public boolean hasStatus() {
diff --git a/src/hdskins/java/com/voxelmodpack/hdskins/gui/EntityPlayerModel.java b/src/hdskins/java/com/voxelmodpack/hdskins/gui/EntityPlayerModel.java
index 303f0027..0bdf110f 100644
--- a/src/hdskins/java/com/voxelmodpack/hdskins/gui/EntityPlayerModel.java
+++ b/src/hdskins/java/com/voxelmodpack/hdskins/gui/EntityPlayerModel.java
@@ -79,6 +79,10 @@ public class EntityPlayerModel extends EntityLivingBase implements IBlankSkinSup
         return skin.uploadComplete() && elytra.uploadComplete();
     }
 
+    public boolean isUsingRemoteTexture() {
+        return skin.hasRemoteTexture() || elytra.hasRemoteTexture();
+    }
+
     public void releaseTextures() {
         skin.clearLocal();
         elytra.clearLocal();