diff --git a/docs/config/setup/config/README.md b/docs/config/setup/config/README.md
index 6b17a38ad..c811c7b08 100644
--- a/docs/config/setup/config/README.md
+++ b/docs/config/setup/config/README.md
@@ -18,8 +18,8 @@
 
 - [addDirective](functions/addDirective.md)
 - [getConfig](functions/getConfig.md)
-- [getLayoutInfo](functions/getLayoutInfo.md)
 - [getSiteConfig](functions/getSiteConfig.md)
+- [getUserDefinedConfig](functions/getUserDefinedConfig.md)
 - [reset](functions/reset.md)
 - [sanitize](functions/sanitize.md)
 - [saveConfigFromInitialize](functions/saveConfigFromInitialize.md)
diff --git a/docs/config/setup/config/functions/getLayoutInfo.md b/docs/config/setup/config/functions/getLayoutInfo.md
deleted file mode 100644
index 044c6f96b..000000000
--- a/docs/config/setup/config/functions/getLayoutInfo.md
+++ /dev/null
@@ -1,27 +0,0 @@
-> **Warning**
->
-> ## THIS IS AN AUTOGENERATED FILE. DO NOT EDIT.
->
-> ## Please edit the corresponding file in [/packages/mermaid/src/docs/config/setup/config/functions/getLayoutInfo.md](../../../../../packages/mermaid/src/docs/config/setup/config/functions/getLayoutInfo.md).
-
-[**mermaid**](../../README.md)
-
----
-
-# Function: getLayoutInfo()
-
-> **getLayoutInfo**(): `object`
-
-Defined in: [packages/mermaid/src/config.ts:260](https://github.com/mermaid-js/mermaid/blob/master/packages/mermaid/src/config.ts#L260)
-
-## Returns
-
-`object`
-
-### isUserDefined
-
-> **isUserDefined**: `boolean`
-
-### layout
-
-> **layout**: `string`
diff --git a/docs/config/setup/config/functions/getUserDefinedConfig.md b/docs/config/setup/config/functions/getUserDefinedConfig.md
new file mode 100644
index 000000000..ed39f1337
--- /dev/null
+++ b/docs/config/setup/config/functions/getUserDefinedConfig.md
@@ -0,0 +1,19 @@
+> **Warning**
+>
+> ## THIS IS AN AUTOGENERATED FILE. DO NOT EDIT.
+>
+> ## Please edit the corresponding file in [/packages/mermaid/src/docs/config/setup/config/functions/getUserDefinedConfig.md](../../../../../packages/mermaid/src/docs/config/setup/config/functions/getUserDefinedConfig.md).
+
+[**mermaid**](../../README.md)
+
+---
+
+# Function: getUserDefinedConfig()
+
+> **getUserDefinedConfig**(): [`MermaidConfig`](../../mermaid/interfaces/MermaidConfig.md)
+
+Defined in: [packages/mermaid/src/config.ts:252](https://github.com/mermaid-js/mermaid/blob/master/packages/mermaid/src/config.ts#L252)
+
+## Returns
+
+[`MermaidConfig`](../../mermaid/interfaces/MermaidConfig.md)
diff --git a/packages/mermaid/src/config.ts b/packages/mermaid/src/config.ts
index 295432ed3..4fcb3224d 100644
--- a/packages/mermaid/src/config.ts
+++ b/packages/mermaid/src/config.ts
@@ -249,18 +249,16 @@ const checkConfig = (config: MermaidConfig) => {
   }
 };
 
-const isUserDefinedLayout = (): boolean => {
-  if (configFromInitialize?.layout) {
-    return true;
+export const getUserDefinedConfig = (): MermaidConfig => {
+  let userConfig: MermaidConfig = {};
+
+  if (configFromInitialize) {
+    userConfig = assignWithDepth(userConfig, configFromInitialize);
   }
 
-  return directives.some((d) => !!d.layout);
-};
+  for (const d of directives) {
+    userConfig = assignWithDepth(userConfig, d);
+  }
 
-export const getLayoutInfo = () => {
-  const cfg = getConfig();
-  return {
-    layout: cfg.layout ?? 'dagre',
-    isUserDefined: isUserDefinedLayout(),
-  };
+  return userConfig;
 };