diff --git a/dotCMS/src/main/java/com/dotcms/rest/api/v1/maintenance/JVMInfoResource.java b/dotCMS/src/main/java/com/dotcms/rest/api/v1/maintenance/JVMInfoResource.java
index 1eb101fa1e66..95f6ab786f60 100644
--- a/dotCMS/src/main/java/com/dotcms/rest/api/v1/maintenance/JVMInfoResource.java
+++ b/dotCMS/src/main/java/com/dotcms/rest/api/v1/maintenance/JVMInfoResource.java
@@ -116,10 +116,8 @@ private Map<String, Object> getDBOverrides(){
 
         SystemTable systemTable =APILocator.getSystemAPI().getSystemTable();
 
-        resultMap.putAll(systemTable.all());
-
-
-
+        systemTable.all().forEach((key, value) ->
+                resultMap.put(key, obfuscateIfNeeded(key, value)));
 
         return resultMap;
     }