diff --git a/model/map-jpa/src/main/java/org/keycloak/models/map/storage/jpa/JpaMapStorage.java b/model/map-jpa/src/main/java/org/keycloak/models/map/storage/jpa/JpaMapStorage.java
index 1c214ab782..14dcb0e0a1 100644
--- a/model/map-jpa/src/main/java/org/keycloak/models/map/storage/jpa/JpaMapStorage.java
+++ b/model/map-jpa/src/main/java/org/keycloak/models/map/storage/jpa/JpaMapStorage.java
@@ -262,7 +262,11 @@ public abstract class JpaMapStorage<RE extends JpaRootEntity, E extends Abstract
         UUID uuid = UUIDKey.INSTANCE.fromStringSafe(key);
         if (uuid == null) return false;
         removeFromCache(key);
-        em.remove(em.getReference(entityType, uuid));
+        // First find the entity, as just trying to remove it will throw an EntityNotFoundException
+        RE entity = em.find(entityType, uuid);
+        if (entity != null) {
+            em.remove(entity);
+        }
         logger.tracef("tx %d: delete entity %s", hashCode(), key);
         return true;
     }