diff --git a/generators/generator-base.js b/generators/generator-base.js
index 81b5cf42d90..51dc717c90d 100644
--- a/generators/generator-base.js
+++ b/generators/generator-base.js
@@ -207,7 +207,7 @@ module.exports = class JHipsterBaseGenerator extends PrivateBase {
   isUsingBuiltInUser() {
     return (
       !this.jhipsterConfig ||
-      !this.jhipsterConfig.skipUserManagement ||
+      (!this.jhipsterConfig.skipUserManagement && this.jhipsterConfig.databaseType !== NO_DATABASE) ||
       (this.jhipsterConfig.authenticationType === OAUTH2 && this.jhipsterConfig.databaseType !== NO_DATABASE)
     );
   }
diff --git a/generators/server/templates/src/main/java/package/config/WebConfigurer.java.ejs b/generators/server/templates/src/main/java/package/config/WebConfigurer.java.ejs
index e89122ba677..a39659ee0d7 100644
--- a/generators/server/templates/src/main/java/package/config/WebConfigurer.java.ejs
+++ b/generators/server/templates/src/main/java/package/config/WebConfigurer.java.ejs
@@ -49,7 +49,7 @@ import org.springframework.context.annotation.Profile;
     <%_ } _%>
 import org.springframework.core.annotation.Order;
 <%_ } _%>
-<%_ if (reactive) { _%>
+<%_ if (reactive && !databaseTypeNo) { _%>
 import org.springframework.data.web.ReactivePageableHandlerMethodArgumentResolver;
 import org.springframework.data.web.ReactiveSortHandlerMethodArgumentResolver;
 <%_ } _%>
@@ -205,6 +205,7 @@ public class WebConfigurer implements <% if (!reactive) { %>ServletContextInitia
     }
 <%_ if (reactive) { _%>
 
+  <%_ if (!databaseTypeNo) { _%>
     // TODO: remove when this is supported in spring-boot
     @Bean
     HandlerMethodArgumentResolver reactivePageableHandlerMethodArgumentResolver() {
@@ -216,6 +217,7 @@ public class WebConfigurer implements <% if (!reactive) { %>ServletContextInitia
     HandlerMethodArgumentResolver reactiveSortHandlerMethodArgumentResolver() {
         return new ReactiveSortHandlerMethodArgumentResolver();
     }
+  <%_ } _%>
 
     @Bean
     @Order(-2) // The handler must have precedence over WebFluxResponseStatusExceptionHandler and Spring Boot's ErrorWebExceptionHandler