diff --git a/generators/entity-client/templates/angular/src/main/webapp/app/entities/route/entity-management-routing.module.ts.ejs b/generators/entity-client/templates/angular/src/main/webapp/app/entities/route/entity-management-routing.module.ts.ejs
index da868de4f06..af7f7ad8d42 100644
--- a/generators/entity-client/templates/angular/src/main/webapp/app/entities/route/entity-management-routing.module.ts.ejs
+++ b/generators/entity-client/templates/angular/src/main/webapp/app/entities/route/entity-management-routing.module.ts.ejs
@@ -33,7 +33,7 @@ const <%= entityInstance %>Route: Routes = [
         component: <%= entityAngularName %>Component,
 <%_ if (paginationPagination) { _%>
         data: {
-            defaultSort: 'id,asc',
+            defaultSort: '<%- primaryKey.name %>,asc',
         },
 <%_ } _%>
         canActivate: [UserRouteAccessService]
diff --git a/generators/entity-server/templates/src/main/java/package/repository/EntityRepositoryInternalImpl_reactive.java.ejs b/generators/entity-server/templates/src/main/java/package/repository/EntityRepositoryInternalImpl_reactive.java.ejs
index 06733f4ad45..1f5d21fa90f 100644
--- a/generators/entity-server/templates/src/main/java/package/repository/EntityRepositoryInternalImpl_reactive.java.ejs
+++ b/generators/entity-server/templates/src/main/java/package/repository/EntityRepositoryInternalImpl_reactive.java.ejs
@@ -149,13 +149,13 @@ _%>
 
     @Override
     public Mono<<%= persistClass %>> findById(<%= primaryKey.type %> id) {
-        return createQuery(null, where("id").is(id)).one();
+        return createQuery(null, where("<%= primaryKey.name %>").is(id)).one();
     }
 
 <%_ if (fieldsContainOwnerManyToMany) { _%>
 
     @Override
-    public Mono<<%= persistClass %>> findOneWithEagerRelationships(Long id) {
+    public Mono<<%= persistClass %>> findOneWithEagerRelationships(<%= primaryKey.type %> id) {
         return findById(id);
     }
 
diff --git a/generators/entity-server/templates/src/main/java/package/repository/EntityRepository_reactive.java.ejs b/generators/entity-server/templates/src/main/java/package/repository/EntityRepository_reactive.java.ejs
index c312752d453..8ad3547fab0 100644
--- a/generators/entity-server/templates/src/main/java/package/repository/EntityRepository_reactive.java.ejs
+++ b/generators/entity-server/templates/src/main/java/package/repository/EntityRepository_reactive.java.ejs
@@ -104,7 +104,7 @@ if (databaseTypeSql) {
     Flux<<%= persistClass %>> findAllWithEagerRelationships(Pageable page);
 
     @Override
-    Mono<Void> deleteById(Long id);
+    Mono<Void> deleteById(<%= primaryKey.type %> id);
 
   <%_ } _%>
 
@@ -138,7 +138,7 @@ if (databaseTypeSql) {
     Flux<<%= persistClass %>> findAll();
 
     @Override
-    Mono<<%= persistClass %>> findById(Long id);
+    Mono<<%= persistClass %>> findById(<%= primaryKey.type %> id);
 
     @Override
     <S extends <%= persistClass %>> Mono<S> save(S entity);
@@ -165,7 +165,7 @@ interface <%= entityClass %>RepositoryInternal {
 
     Flux<<%= persistClass %>> findAllWithEagerRelationships(Pageable page);
 
-    Mono<Void> deleteById(Long id);
+    Mono<Void> deleteById(<%= primaryKey.type %> id);
   <%_ } _%>
 
 }