diff --git a/model/map-hot-rod/src/main/java/org/keycloak/models/map/storage/hotRod/authorization/HotRodResourceServerEntity.java b/model/map-hot-rod/src/main/java/org/keycloak/models/map/storage/hotRod/authorization/HotRodResourceServerEntity.java
index 1f7b03dcb2..7ff256c66b 100644
--- a/model/map-hot-rod/src/main/java/org/keycloak/models/map/storage/hotRod/authorization/HotRodResourceServerEntity.java
+++ b/model/map-hot-rod/src/main/java/org/keycloak/models/map/storage/hotRod/authorization/HotRodResourceServerEntity.java
@@ -29,6 +29,7 @@ import org.keycloak.models.map.storage.hotRod.common.UpdatableHotRodEntityDelega
         implementInterface = "org.keycloak.models.map.authorization.entity.MapResourceServerEntity",
         inherits = "org.keycloak.models.map.storage.hotRod.authorization.HotRodResourceServerEntity.AbstractHotRodResourceServerEntity"
 )
+@ProtoDoc("@Indexed")
 public class HotRodResourceServerEntity extends AbstractHotRodEntity {
 
     @ProtoDoc("@Field(index = Index.YES, store = Store.YES)")
diff --git a/model/map-hot-rod/src/main/resources/config/cacheConfig.xml b/model/map-hot-rod/src/main/resources/config/cacheConfig.xml
index 51807208ba..d95ec65f48 100644
--- a/model/map-hot-rod/src/main/resources/config/cacheConfig.xml
+++ b/model/map-hot-rod/src/main/resources/config/cacheConfig.xml
@@ -92,6 +92,7 @@
             <encoding media-type="application/x-protostream"/>
             <indexing>
                 <indexed-entities>
+                    <indexed-entity>kc.HotRodResourceServerEntity</indexed-entity>
                     <indexed-entity>kc.HotRodResourceEntity</indexed-entity>
                     <indexed-entity>kc.HotRodScopeEntity</indexed-entity>
                     <indexed-entity>kc.HotRodPolicyEntity</indexed-entity>
diff --git a/model/map-hot-rod/src/main/resources/config/infinispan.xml b/model/map-hot-rod/src/main/resources/config/infinispan.xml
index ab351a748e..cd8dfc0a49 100644
--- a/model/map-hot-rod/src/main/resources/config/infinispan.xml
+++ b/model/map-hot-rod/src/main/resources/config/infinispan.xml
@@ -94,6 +94,7 @@
             <encoding media-type="application/x-protostream"/>
             <indexing>
                 <indexed-entities>
+                    <indexed-entity>kc.HotRodResourceServerEntity</indexed-entity>
                     <indexed-entity>kc.HotRodResourceEntity</indexed-entity>
                     <indexed-entity>kc.HotRodScopeEntity</indexed-entity>
                     <indexed-entity>kc.HotRodPolicyEntity</indexed-entity>
diff --git a/testsuite/model/src/main/resources/hotrod/infinispan.xml b/testsuite/model/src/main/resources/hotrod/infinispan.xml
index 966f772a4d..7e1e619716 100644
--- a/testsuite/model/src/main/resources/hotrod/infinispan.xml
+++ b/testsuite/model/src/main/resources/hotrod/infinispan.xml
@@ -90,6 +90,7 @@
             <encoding media-type="application/x-protostream"/>
             <indexing>
                 <indexed-entities>
+                    <indexed-entity>kc.HotRodResourceServerEntity</indexed-entity>
                     <indexed-entity>kc.HotRodResourceEntity</indexed-entity>
                     <indexed-entity>kc.HotRodScopeEntity</indexed-entity>
                     <indexed-entity>kc.HotRodPolicyEntity</indexed-entity>