diff --git a/source/java/org/alfresco/repo/cache/lookup/EntityLookupCache.java b/source/java/org/alfresco/repo/cache/lookup/EntityLookupCache.java
index ed51a435f1..2caaa8d0f1 100644
--- a/source/java/org/alfresco/repo/cache/lookup/EntityLookupCache.java
+++ b/source/java/org/alfresco/repo/cache/lookup/EntityLookupCache.java
@@ -341,10 +341,10 @@ public class EntityLookupCache<K extends Serializable, V extends Object, VK exte
                 CacheRegionValueKey valueCacheKey = new CacheRegionValueKey(cacheRegion, valueKey);
                 // The key is good, so we can cache the value
                 cache.put(valueCacheKey, key);
-                cache.put(
-                        keyCacheKey,
-                        (value == null ? VALUE_NULL : value));
             }
+            cache.put(
+                    keyCacheKey,
+                    (value == null ? VALUE_NULL : value));
         }
         // Done
         return entityPair;