diff --git a/src/main/java/com/faforever/api/data/domain/Game.java b/src/main/java/com/faforever/api/data/domain/Game.java
index 41eee6ff9..92efb43e0 100644
--- a/src/main/java/com/faforever/api/data/domain/Game.java
+++ b/src/main/java/com/faforever/api/data/domain/Game.java
@@ -139,7 +139,6 @@ public Set<GameReview> getReviews() {
   @OneToOne(fetch = FetchType.LAZY)
   @PrimaryKeyJoinColumn
   @UpdatePermission(expression = Prefab.ALL)
-  @BatchSize(size = 1000)
   public GameReviewsSummary getReviewsSummary() {
     return reviewsSummary;
   }
diff --git a/src/main/java/com/faforever/api/data/domain/GameReviewsSummary.java b/src/main/java/com/faforever/api/data/domain/GameReviewsSummary.java
index bbfd8d443..9ac90d6c4 100644
--- a/src/main/java/com/faforever/api/data/domain/GameReviewsSummary.java
+++ b/src/main/java/com/faforever/api/data/domain/GameReviewsSummary.java
@@ -2,7 +2,6 @@
 
 import com.yahoo.elide.annotation.Include;
 import lombok.Setter;
-import org.hibernate.annotations.BatchSize;
 import org.hibernate.annotations.Immutable;
 
 import jakarta.annotation.Nullable;
@@ -65,7 +64,6 @@ public Float getAverageScore() {
   }
 
   @OneToOne(mappedBy = "reviewsSummary")
-  @BatchSize(size = 1000)
   public Game getGame() {
     return game;
   }
diff --git a/src/main/java/com/faforever/api/data/domain/Map.java b/src/main/java/com/faforever/api/data/domain/Map.java
index b1a58a289..f29a248a6 100644
--- a/src/main/java/com/faforever/api/data/domain/Map.java
+++ b/src/main/java/com/faforever/api/data/domain/Map.java
@@ -96,7 +96,6 @@ public List<MapVersion> getVersions() {
   @ManyToOne(fetch = FetchType.LAZY)
   @JoinColumn(name = "author")
   @Nullable
-  @BatchSize(size = 1000)
   public Player getAuthor() {
     return author;
   }
@@ -114,7 +113,6 @@ public MapStatistics getStatistics() {
           referencedColumnName = "id")
       )
   })
-  @BatchSize(size = 1000)
   public MapVersion getLatestVersion() {
     return latestVersion;
   }
@@ -134,7 +132,6 @@ public MapReviewsSummary getReviewsSummary() {
   @ManyToOne
   @JoinColumn(name = "license")
   @Nullable
-  @BatchSize(size = 1000)
   public License getLicense() {
     return license;
   }
diff --git a/src/main/java/com/faforever/api/data/domain/MapReviewsSummary.java b/src/main/java/com/faforever/api/data/domain/MapReviewsSummary.java
index fe1dd35ac..2180d3a2a 100644
--- a/src/main/java/com/faforever/api/data/domain/MapReviewsSummary.java
+++ b/src/main/java/com/faforever/api/data/domain/MapReviewsSummary.java
@@ -2,7 +2,6 @@
 
 import com.yahoo.elide.annotation.Include;
 import lombok.Setter;
-import org.hibernate.annotations.BatchSize;
 import org.hibernate.annotations.Immutable;
 
 import jakarta.annotation.Nullable;
@@ -70,7 +69,6 @@ public Float getAverageScore() {
 
   @OneToOne(fetch = FetchType.LAZY)
   @JoinColumn(name = "map_id", insertable = false, updatable = false)
-  @BatchSize(size = 1000)
   public Map getMap() {
     return map;
   }
diff --git a/src/main/java/com/faforever/api/data/domain/MapVersion.java b/src/main/java/com/faforever/api/data/domain/MapVersion.java
index 9dbe2b4df..5fab0d669 100644
--- a/src/main/java/com/faforever/api/data/domain/MapVersion.java
+++ b/src/main/java/com/faforever/api/data/domain/MapVersion.java
@@ -11,7 +11,6 @@
 import com.yahoo.elide.annotation.Include;
 import com.yahoo.elide.annotation.UpdatePermission;
 import lombok.Setter;
-import org.hibernate.annotations.BatchSize;
 
 import jakarta.persistence.Column;
 import jakarta.persistence.Entity;
@@ -112,7 +111,6 @@ public boolean isHidden() {
   @ManyToOne(fetch = FetchType.LAZY)
   @JoinColumn(name = "map_id")
   @NotNull
-  @BatchSize(size = 1000)
   public Map getMap() {
     return this.map;
   }
diff --git a/src/main/java/com/faforever/api/data/domain/MapVersionReviewsSummary.java b/src/main/java/com/faforever/api/data/domain/MapVersionReviewsSummary.java
index 32b0469b0..9e52489c2 100644
--- a/src/main/java/com/faforever/api/data/domain/MapVersionReviewsSummary.java
+++ b/src/main/java/com/faforever/api/data/domain/MapVersionReviewsSummary.java
@@ -2,7 +2,6 @@
 
 import com.yahoo.elide.annotation.Include;
 import lombok.Setter;
-import org.hibernate.annotations.BatchSize;
 import org.hibernate.annotations.Immutable;
 
 import jakarta.annotation.Nullable;
@@ -70,7 +69,6 @@ public Float getAverageScore() {
 
   @OneToOne(fetch = FetchType.LAZY)
   @JoinColumn(name = "map_version_id", insertable = false, updatable = false)
-  @BatchSize(size = 1000)
   public MapVersion getMapVersion() {
     return mapVersion;
   }
diff --git a/src/main/java/com/faforever/api/data/domain/MapVersionStatistics.java b/src/main/java/com/faforever/api/data/domain/MapVersionStatistics.java
index e6a3d4d37..b68a8fb06 100644
--- a/src/main/java/com/faforever/api/data/domain/MapVersionStatistics.java
+++ b/src/main/java/com/faforever/api/data/domain/MapVersionStatistics.java
@@ -2,7 +2,6 @@
 
 import com.yahoo.elide.annotation.Include;
 import lombok.Setter;
-import org.hibernate.annotations.BatchSize;
 import org.hibernate.annotations.Immutable;
 
 import jakarta.persistence.Column;
@@ -48,7 +47,6 @@ public Integer getDraws() {
 
   @OneToOne(fetch = FetchType.LAZY)
   @JoinColumn(name = "map_version_id", insertable = false, updatable = false)
-  @BatchSize(size = 1000)
   public MapVersion getMapVersion() {
     return mapVersion;
   }
diff --git a/src/main/java/com/faforever/api/data/domain/Mod.java b/src/main/java/com/faforever/api/data/domain/Mod.java
index c55f52b23..0f7323df0 100644
--- a/src/main/java/com/faforever/api/data/domain/Mod.java
+++ b/src/main/java/com/faforever/api/data/domain/Mod.java
@@ -6,7 +6,6 @@
 import com.yahoo.elide.annotation.Include;
 import com.yahoo.elide.annotation.UpdatePermission;
 import lombok.Setter;
-import org.hibernate.annotations.BatchSize;
 import org.hibernate.annotations.JoinColumnOrFormula;
 import org.hibernate.annotations.JoinColumnsOrFormulas;
 import org.hibernate.annotations.JoinFormula;
@@ -114,7 +113,6 @@ public ModReviewsSummary getReviewsSummary() {
   @ManyToOne
   @JoinColumn(name = "license")
   @Nullable
-  @BatchSize(size = 1000)
   public License getLicense() {
     return license;
   }
diff --git a/src/main/java/com/faforever/api/data/domain/ModReviewsSummary.java b/src/main/java/com/faforever/api/data/domain/ModReviewsSummary.java
index d62a676d1..697d0443b 100644
--- a/src/main/java/com/faforever/api/data/domain/ModReviewsSummary.java
+++ b/src/main/java/com/faforever/api/data/domain/ModReviewsSummary.java
@@ -2,7 +2,6 @@
 
 import com.yahoo.elide.annotation.Include;
 import lombok.Setter;
-import org.hibernate.annotations.BatchSize;
 import org.hibernate.annotations.Immutable;
 
 import jakarta.annotation.Nullable;
@@ -70,7 +69,6 @@ public Float getAverageScore() {
 
   @OneToOne(fetch = FetchType.LAZY)
   @JoinColumn(name = "mod_id", insertable = false, updatable = false)
-  @BatchSize(size = 1000)
   public Mod getMod() {
     return mod;
   }
diff --git a/src/main/java/com/faforever/api/data/domain/ModVersionReviewsSummary.java b/src/main/java/com/faforever/api/data/domain/ModVersionReviewsSummary.java
index 301b8acc2..c569890a4 100644
--- a/src/main/java/com/faforever/api/data/domain/ModVersionReviewsSummary.java
+++ b/src/main/java/com/faforever/api/data/domain/ModVersionReviewsSummary.java
@@ -2,7 +2,6 @@
 
 import com.yahoo.elide.annotation.Include;
 import lombok.Setter;
-import org.hibernate.annotations.BatchSize;
 import org.hibernate.annotations.Immutable;
 
 import jakarta.annotation.Nullable;
@@ -70,7 +69,6 @@ public Float getAverageScore() {
 
   @OneToOne(fetch = FetchType.LAZY)
   @JoinColumn(name = "mod_version_id", insertable = false, updatable = false)
-  @BatchSize(size = 1000)
   public ModVersion getModVersion() {
     return modVersion;
   }