keycloak-uncached

diff --git a/model/infinispan/src/main/java/org/keycloak/models/sessions/infinispan/UserSessionAdapter.java b/model/infinispan/src/main/java/org/keycloak/models/sessions/infinispan/UserSessionAdapter.java
index 993d99b..bf1e6fd 100755
--- a/model/infinispan/src/main/java/org/keycloak/models/sessions/infinispan/UserSessionAdapter.java
+++ b/model/infinispan/src/main/java/org/keycloak/models/sessions/infinispan/UserSessionAdapter.java
@@ -124,6 +124,12 @@ public class UserSessionAdapter implements UserSessionModel {
         if (entity.getNotes() == null) {
             entity.setNotes(new ConcurrentHashMap<>());
         }
+        if (value == null) {
+            if (entity.getNotes().containsKey(name)) {
+                removeNote(name);
+            }
+            return;
+        }
         entity.getNotes().put(name, value);
         update();
     }