diff --git a/dd-trace-api/src/main/java/datadog/trace/api/config/ProfilingConfig.java b/dd-trace-api/src/main/java/datadog/trace/api/config/ProfilingConfig.java
index c90ec39888e..049da3e45e6 100644
--- a/dd-trace-api/src/main/java/datadog/trace/api/config/ProfilingConfig.java
+++ b/dd-trace-api/src/main/java/datadog/trace/api/config/ProfilingConfig.java
@@ -11,7 +11,12 @@ public final class ProfilingConfig {
   public static final boolean PROFILING_ENABLED_DEFAULT = false;
   public static final String PROFILING_ALLOCATION_ENABLED = "profiling.allocation.enabled";
   public static final String PROFILING_HEAP_ENABLED = "profiling.heap.enabled";
-  public static final boolean PROFILING_HEAP_ENABLED_DEFAULT = false;
+
+  /**
+   * @deprecated The default is now computed dynamically based on JVM capabilities.
+   */
+  @Deprecated public static final boolean PROFILING_HEAP_ENABLED_DEFAULT = false;
+
   @Deprecated // Use dd.site instead
   public static final String PROFILING_URL = "profiling.url";
   @Deprecated // Use dd.api-key instead
diff --git a/metadata/supported-configurations.json b/metadata/supported-configurations.json
index ac7935039e3..7e72ae11e75 100644
--- a/metadata/supported-configurations.json
+++ b/metadata/supported-configurations.json
@@ -3045,7 +3045,7 @@
       {
         "version": "A",
         "type": "boolean",
-        "default": "false",
+        "default": "true",
         "aliases": []
       }
     ],