diff --git a/jadx-core/src/main/java/jadx/core/dex/info/ConstStorage.java b/jadx-core/src/main/java/jadx/core/dex/info/ConstStorage.java
index cbb30286a..938c5f8ee 100644
--- a/jadx-core/src/main/java/jadx/core/dex/info/ConstStorage.java
+++ b/jadx-core/src/main/java/jadx/core/dex/info/ConstStorage.java
@@ -38,16 +38,16 @@ public class ConstStorage {
 		 * @return true if this value is duplicated
 		 */
 		public boolean put(Object value, FieldNode fld) {
+			if (duplicates.contains(value)) {
+				values.remove(value);
+				return true;
+			}
 			FieldNode prev = values.put(value, fld);
 			if (prev != null) {
 				values.remove(value);
 				duplicates.add(value);
 				return true;
 			}
-			if (duplicates.contains(value)) {
-				values.remove(value);
-				return true;
-			}
 			return false;
 		}