diff --git a/generators/entity-server/templates/src/main/java/package/repository/EntityRepository.java.ejs b/generators/entity-server/templates/src/main/java/package/repository/EntityRepository.java.ejs
index 54cf7916357..4b88d944ff4 100644
--- a/generators/entity-server/templates/src/main/java/package/repository/EntityRepository.java.ejs
+++ b/generators/entity-server/templates/src/main/java/package/repository/EntityRepository.java.ejs
@@ -119,7 +119,7 @@ public interface <%= entityClass %>Repository extends <% if (databaseTypeSql) {
     @Query("{}")
     List<<%= persistClass %>> findAllWithEagerRelationships();
 
-    @Query("{}")
+    @Query("{'id': ?0}")
     Optional<<%= persistClass %>> findOneWithEagerRelationships(<%= primaryKey.type %> id);
     <%_
     }