diff --git a/commons/src/main/java/com/vitorpamplona/amethyst/commons/compose/CachedState.kt b/commons/src/main/java/com/vitorpamplona/amethyst/commons/compose/CachedState.kt
index 3e2f9eea7..ea02558ee 100644
--- a/commons/src/main/java/com/vitorpamplona/amethyst/commons/compose/CachedState.kt
+++ b/commons/src/main/java/com/vitorpamplona/amethyst/commons/compose/CachedState.kt
@@ -53,7 +53,9 @@ abstract class GenericBaseCache<K, V>(capacity: Int) : CachedState<K, V> {
 
         val v = compute(k)
 
-        cache.put(k, v)
+        if (v != null) {
+            cache.put(k, v)
+        }
 
         return v
     }