diff --git a/spring-cloud-dataflow-server-core/src/main/resources/META-INF/dataflow-server-defaults.yml b/spring-cloud-dataflow-server-core/src/main/resources/META-INF/dataflow-server-defaults.yml
index 827d0eb32e..8c1e7a4dea 100644
--- a/spring-cloud-dataflow-server-core/src/main/resources/META-INF/dataflow-server-defaults.yml
+++ b/spring-cloud-dataflow-server-core/src/main/resources/META-INF/dataflow-server-defaults.yml
@@ -14,10 +14,6 @@ management:
           autotime:
             enabled: true # true is default to Boot 2.3.2 at least.
             percentiles-histogram: true
-    export:
-      prometheus:
-        rsocket:
-          enabled: false
   influx:
     metrics:
       export:
@@ -26,6 +22,8 @@ management:
     metrics:
       export:
         enabled: false
+        rsocket:
+          enabled: false
   wavefront:
     metrics:
       export:
diff --git a/spring-cloud-skipper/spring-cloud-skipper-server-core/src/main/resources/application.yml b/spring-cloud-skipper/spring-cloud-skipper-server-core/src/main/resources/application.yml
index 49e575015e..67307bab5b 100644
--- a/spring-cloud-skipper/spring-cloud-skipper-server-core/src/main/resources/application.yml
+++ b/spring-cloud-skipper/spring-cloud-skipper-server-core/src/main/resources/application.yml
@@ -25,10 +25,6 @@ management:
           autotime:
             enabled: true # true is default to Boot 2.3.2 at least.
             percentiles-histogram: true
-    export:
-      prometheus:
-        rsocket:
-          enabled: false
   influx:
     metrics:
       export:
@@ -37,6 +33,8 @@ management:
     metrics:
       export:
         enabled: false
+        rsocket:
+          enabled: false
   wavefront:
     metrics:
       export: