diff --git a/jadx-core/src/main/java/jadx/core/dex/nodes/ClassNode.java b/jadx-core/src/main/java/jadx/core/dex/nodes/ClassNode.java
index 5615e858a..9e92e69a0 100644
--- a/jadx-core/src/main/java/jadx/core/dex/nodes/ClassNode.java
+++ b/jadx-core/src/main/java/jadx/core/dex/nodes/ClassNode.java
@@ -171,7 +171,9 @@ public class ClassNode extends LineAttrNode implements ILoadable, ICodeNode {
 
 	private void loadStaticValues(ClassDef cls, List<FieldNode> staticFields) throws DecodeException {
 		for (FieldNode f : staticFields) {
-			if (f.getAccessFlags().isFinal()) {
+			AccessInfo flags = f.getAccessFlags();
+			if (flags.isStatic() && flags.isFinal()) {
+				LOG.debug("loadStaticValues(): Adding NULL initializer to static final field {}", f.getAlias());
 				f.addAttr(FieldInitAttr.NULL_VALUE);
 			}
 		}