diff --git a/code/addons/links/package.json b/code/addons/links/package.json
index 6ae0722cfc8f..a32f72851b17 100644
--- a/code/addons/links/package.json
+++ b/code/addons/links/package.json
@@ -67,7 +67,7 @@
     "prep": "node --loader ../../../scripts/node_modules/esbuild-register/loader.js -r ../../../scripts/node_modules/esbuild-register/register.js ../../../scripts/prepare/addon-bundle.ts"
   },
   "dependencies": {
-    "@storybook/csf": "0.1.4--canary.82.2a09ac2.0",
+    "@storybook/csf": "0.1.4--canary.82.eb42c88.0",
     "@storybook/global": "^5.0.0",
     "ts-dedent": "^2.0.0"
   },
diff --git a/code/lib/codemod/package.json b/code/lib/codemod/package.json
index 36de62dbfcf0..e530755b7795 100644
--- a/code/lib/codemod/package.json
+++ b/code/lib/codemod/package.json
@@ -57,7 +57,7 @@
     "@babel/core": "^7.23.2",
     "@babel/preset-env": "^7.23.2",
     "@babel/types": "^7.23.0",
-    "@storybook/csf": "0.1.4--canary.82.2a09ac2.0",
+    "@storybook/csf": "0.1.4--canary.82.eb42c88.0",
     "@storybook/csf-tools": "workspace:*",
     "@storybook/node-logger": "workspace:*",
     "@storybook/types": "workspace:*",
diff --git a/code/lib/core-server/package.json b/code/lib/core-server/package.json
index 797258e060d3..3a022dbf7260 100644
--- a/code/lib/core-server/package.json
+++ b/code/lib/core-server/package.json
@@ -62,7 +62,7 @@
     "@storybook/channels": "workspace:*",
     "@storybook/core-common": "workspace:*",
     "@storybook/core-events": "workspace:*",
-    "@storybook/csf": "0.1.4--canary.82.2a09ac2.0",
+    "@storybook/csf": "0.1.4--canary.82.eb42c88.0",
     "@storybook/csf-tools": "workspace:*",
     "@storybook/docs-mdx": "3.0.0",
     "@storybook/global": "^5.0.0",
diff --git a/code/lib/csf-tools/package.json b/code/lib/csf-tools/package.json
index a8b6fdf5ec81..1207ccfbe38f 100644
--- a/code/lib/csf-tools/package.json
+++ b/code/lib/csf-tools/package.json
@@ -46,7 +46,7 @@
     "@babel/parser": "^7.23.0",
     "@babel/traverse": "^7.23.2",
     "@babel/types": "^7.23.0",
-    "@storybook/csf": "0.1.4--canary.82.2a09ac2.0",
+    "@storybook/csf": "0.1.4--canary.82.eb42c88.0",
     "@storybook/types": "workspace:*",
     "fs-extra": "^11.1.0",
     "recast": "^0.23.5",
diff --git a/code/lib/manager-api/package.json b/code/lib/manager-api/package.json
index 06ffc46be6a7..03d368380a9f 100644
--- a/code/lib/manager-api/package.json
+++ b/code/lib/manager-api/package.json
@@ -47,7 +47,7 @@
     "@storybook/channels": "workspace:*",
     "@storybook/client-logger": "workspace:*",
     "@storybook/core-events": "workspace:*",
-    "@storybook/csf": "0.1.4--canary.82.2a09ac2.0",
+    "@storybook/csf": "0.1.4--canary.82.eb42c88.0",
     "@storybook/global": "^5.0.0",
     "@storybook/icons": "^1.2.5",
     "@storybook/router": "workspace:*",
diff --git a/code/lib/preview-api/package.json b/code/lib/preview-api/package.json
index c666a90fa74b..f2a7d5856bb8 100644
--- a/code/lib/preview-api/package.json
+++ b/code/lib/preview-api/package.json
@@ -47,7 +47,7 @@
     "@storybook/channels": "workspace:*",
     "@storybook/client-logger": "workspace:*",
     "@storybook/core-events": "workspace:*",
-    "@storybook/csf": "0.1.4--canary.82.2a09ac2.0",
+    "@storybook/csf": "0.1.4--canary.82.eb42c88.0",
     "@storybook/global": "^5.0.0",
     "@storybook/types": "workspace:*",
     "@types/qs": "^6.9.5",
diff --git a/code/lib/source-loader/package.json b/code/lib/source-loader/package.json
index 0c68ff7cda5a..27da53aee4ac 100644
--- a/code/lib/source-loader/package.json
+++ b/code/lib/source-loader/package.json
@@ -45,7 +45,7 @@
     "prep": "node --loader ../../../scripts/node_modules/esbuild-register/loader.js -r ../../../scripts/node_modules/esbuild-register/register.js ../../../scripts/prepare/bundle.ts"
   },
   "dependencies": {
-    "@storybook/csf": "0.1.4--canary.82.2a09ac2.0",
+    "@storybook/csf": "0.1.4--canary.82.eb42c88.0",
     "@storybook/types": "workspace:*",
     "estraverse": "^5.2.0",
     "lodash": "^4.17.21",
diff --git a/code/lib/types/package.json b/code/lib/types/package.json
index e2f830db5924..c5011426fc02 100644
--- a/code/lib/types/package.json
+++ b/code/lib/types/package.json
@@ -49,7 +49,7 @@
     "file-system-cache": "2.3.0"
   },
   "devDependencies": {
-    "@storybook/csf": "0.1.4--canary.82.2a09ac2.0",
+    "@storybook/csf": "0.1.4--canary.82.eb42c88.0",
     "@types/fs-extra": "^11.0.1",
     "@types/node": "^18.0.0",
     "typescript": "^5.3.2"
diff --git a/code/package.json b/code/package.json
index 5037ec794b73..cbd113dd93fa 100644
--- a/code/package.json
+++ b/code/package.json
@@ -127,7 +127,7 @@
     "@storybook/core-events": "workspace:*",
     "@storybook/core-server": "workspace:*",
     "@storybook/core-webpack": "workspace:*",
-    "@storybook/csf": "0.1.4--canary.82.2a09ac2.0",
+    "@storybook/csf": "0.1.4--canary.82.eb42c88.0",
     "@storybook/csf-plugin": "workspace:*",
     "@storybook/csf-tools": "workspace:*",
     "@storybook/docs-tools": "workspace:*",
diff --git a/code/renderers/server/package.json b/code/renderers/server/package.json
index a87f0f15700d..915e952ae7c3 100644
--- a/code/renderers/server/package.json
+++ b/code/renderers/server/package.json
@@ -46,7 +46,7 @@
     "prep": "node --loader ../../../scripts/node_modules/esbuild-register/loader.js -r ../../../scripts/node_modules/esbuild-register/register.js ../../../scripts/prepare/bundle.ts"
   },
   "dependencies": {
-    "@storybook/csf": "0.1.4--canary.82.2a09ac2.0",
+    "@storybook/csf": "0.1.4--canary.82.eb42c88.0",
     "@storybook/csf-tools": "workspace:*",
     "@storybook/global": "^5.0.0",
     "@storybook/preview-api": "workspace:*",
diff --git a/code/renderers/server/src/render.ts b/code/renderers/server/src/render.ts
index 0a768647d740..0c910f7ba706 100644
--- a/code/renderers/server/src/render.ts
+++ b/code/renderers/server/src/render.ts
@@ -22,7 +22,8 @@ const buildStoryArgs = (args: Args, argTypes: ArgTypes) => {
   Object.keys(argTypes).forEach((key: string) => {
     const argType = argTypes[key];
     const { control } = argType;
-    const controlType = control && control.type.toLowerCase();
+    const controlType =
+      control && typeof control === 'object' && 'type' in control && control.type?.toLowerCase();
     const argValue = storyArgs[key];
     switch (controlType) {
       case 'date':
diff --git a/code/ui/blocks/package.json b/code/ui/blocks/package.json
index a42dcf5d314b..358ce8515d9b 100644
--- a/code/ui/blocks/package.json
+++ b/code/ui/blocks/package.json
@@ -48,7 +48,7 @@
     "@storybook/client-logger": "workspace:*",
     "@storybook/components": "workspace:*",
     "@storybook/core-events": "workspace:*",
-    "@storybook/csf": "0.1.4--canary.82.2a09ac2.0",
+    "@storybook/csf": "0.1.4--canary.82.eb42c88.0",
     "@storybook/docs-tools": "workspace:*",
     "@storybook/global": "^5.0.0",
     "@storybook/icons": "^1.2.5",
diff --git a/code/ui/blocks/src/components/ArgsTable/types.ts b/code/ui/blocks/src/components/ArgsTable/types.ts
index 653bf236acdb..7efb484fe6a9 100644
--- a/code/ui/blocks/src/components/ArgsTable/types.ts
+++ b/code/ui/blocks/src/components/ArgsTable/types.ts
@@ -46,11 +46,11 @@ export interface ArgType {
     disable?: boolean;
     subcategory?: string;
     defaultValue?: {
-      summary: string;
+      summary?: string;
       detail?: string;
     };
     type?: {
-      summary: string;
+      summary?: string;
       detail?: string;
     };
     readonly?: boolean;
diff --git a/code/ui/components/package.json b/code/ui/components/package.json
index f93c613015f1..e5f901c7f290 100644
--- a/code/ui/components/package.json
+++ b/code/ui/components/package.json
@@ -61,7 +61,7 @@
   "dependencies": {
     "@radix-ui/react-slot": "^1.0.2",
     "@storybook/client-logger": "workspace:*",
-    "@storybook/csf": "0.1.4--canary.82.2a09ac2.0",
+    "@storybook/csf": "0.1.4--canary.82.eb42c88.0",
     "@storybook/global": "^5.0.0",
     "@storybook/icons": "^1.2.5",
     "@storybook/theming": "workspace:*",
diff --git a/code/yarn.lock b/code/yarn.lock
index 60868d2982d9..38f36fad686f 100644
--- a/code/yarn.lock
+++ b/code/yarn.lock
@@ -4947,7 +4947,7 @@ __metadata:
   dependencies:
     "@storybook/client-logger": "workspace:*"
     "@storybook/core-events": "workspace:*"
-    "@storybook/csf": "npm:0.1.4--canary.82.2a09ac2.0"
+    "@storybook/csf": "npm:0.1.4--canary.82.eb42c88.0"
     "@storybook/global": "npm:^5.0.0"
     "@storybook/manager-api": "workspace:*"
     "@storybook/preview-api": "workspace:*"
@@ -5215,7 +5215,7 @@ __metadata:
     "@storybook/client-logger": "workspace:*"
     "@storybook/components": "workspace:*"
     "@storybook/core-events": "workspace:*"
-    "@storybook/csf": "npm:0.1.4--canary.82.2a09ac2.0"
+    "@storybook/csf": "npm:0.1.4--canary.82.eb42c88.0"
     "@storybook/docs-tools": "workspace:*"
     "@storybook/global": "npm:^5.0.0"
     "@storybook/icons": "npm:^1.2.5"
@@ -5446,7 +5446,7 @@ __metadata:
     "@babel/core": "npm:^7.23.2"
     "@babel/preset-env": "npm:^7.23.2"
     "@babel/types": "npm:^7.23.0"
-    "@storybook/csf": "npm:0.1.4--canary.82.2a09ac2.0"
+    "@storybook/csf": "npm:0.1.4--canary.82.eb42c88.0"
     "@storybook/csf-tools": "workspace:*"
     "@storybook/node-logger": "workspace:*"
     "@storybook/types": "workspace:*"
@@ -5482,7 +5482,7 @@ __metadata:
     "@radix-ui/react-scroll-area": "npm:^1.0.5"
     "@radix-ui/react-slot": "npm:^1.0.2"
     "@storybook/client-logger": "workspace:*"
-    "@storybook/csf": "npm:0.1.4--canary.82.2a09ac2.0"
+    "@storybook/csf": "npm:0.1.4--canary.82.eb42c88.0"
     "@storybook/global": "npm:^5.0.0"
     "@storybook/icons": "npm:^1.2.5"
     "@storybook/test": "workspace:*"
@@ -5575,7 +5575,7 @@ __metadata:
     "@storybook/channels": "workspace:*"
     "@storybook/core-common": "workspace:*"
     "@storybook/core-events": "workspace:*"
-    "@storybook/csf": "npm:0.1.4--canary.82.2a09ac2.0"
+    "@storybook/csf": "npm:0.1.4--canary.82.eb42c88.0"
     "@storybook/csf-tools": "workspace:*"
     "@storybook/docs-mdx": "npm:3.0.0"
     "@storybook/global": "npm:^5.0.0"
@@ -5657,7 +5657,7 @@ __metadata:
     "@babel/parser": "npm:^7.23.0"
     "@babel/traverse": "npm:^7.23.2"
     "@babel/types": "npm:^7.23.0"
-    "@storybook/csf": "npm:0.1.4--canary.82.2a09ac2.0"
+    "@storybook/csf": "npm:0.1.4--canary.82.eb42c88.0"
     "@storybook/types": "workspace:*"
     "@types/fs-extra": "npm:^11.0.1"
     "@types/js-yaml": "npm:^4.0.5"
@@ -5669,12 +5669,12 @@ __metadata:
   languageName: unknown
   linkType: soft
 
-"@storybook/csf@npm:0.1.4--canary.82.2a09ac2.0":
-  version: 0.1.4--canary.82.2a09ac2.0
-  resolution: "@storybook/csf@npm:0.1.4--canary.82.2a09ac2.0"
+"@storybook/csf@npm:0.1.4--canary.82.eb42c88.0":
+  version: 0.1.4--canary.82.eb42c88.0
+  resolution: "@storybook/csf@npm:0.1.4--canary.82.eb42c88.0"
   dependencies:
     type-fest: "npm:^2.19.0"
-  checksum: 10c0/85f88a3451d62e2591c4bcf3136ef854397e3850ca5cd4e061b05e01437a472dc96f8520e5935f8d991fd679174d650bce2a797aef1c4e735c3c8130e6c8d11e
+  checksum: 10c0/ecf33ccc2fbadf2d7e8add3a38f7dcd993c4168619b61709295231fd741fa9a1cabcd6471bfc5b870418c300461ac021345eea7bdde5188811acd0ddc44bb9f8
   languageName: node
   linkType: hard
 
@@ -5854,7 +5854,7 @@ __metadata:
     "@storybook/channels": "workspace:*"
     "@storybook/client-logger": "workspace:*"
     "@storybook/core-events": "workspace:*"
-    "@storybook/csf": "npm:0.1.4--canary.82.2a09ac2.0"
+    "@storybook/csf": "npm:0.1.4--canary.82.eb42c88.0"
     "@storybook/global": "npm:^5.0.0"
     "@storybook/icons": "npm:^1.2.5"
     "@storybook/router": "workspace:*"
@@ -6187,7 +6187,7 @@ __metadata:
     "@storybook/client-logger": "workspace:*"
     "@storybook/core-common": "workspace:*"
     "@storybook/core-events": "workspace:*"
-    "@storybook/csf": "npm:0.1.4--canary.82.2a09ac2.0"
+    "@storybook/csf": "npm:0.1.4--canary.82.eb42c88.0"
     "@storybook/global": "npm:^5.0.0"
     "@storybook/types": "workspace:*"
     "@types/qs": "npm:^6.9.5"
@@ -6372,7 +6372,7 @@ __metadata:
     "@storybook/core-events": "workspace:*"
     "@storybook/core-server": "workspace:*"
     "@storybook/core-webpack": "workspace:*"
-    "@storybook/csf": "npm:0.1.4--canary.82.2a09ac2.0"
+    "@storybook/csf": "npm:0.1.4--canary.82.eb42c88.0"
     "@storybook/csf-plugin": "workspace:*"
     "@storybook/csf-tools": "workspace:*"
     "@storybook/docs-tools": "workspace:*"
@@ -6527,7 +6527,7 @@ __metadata:
   version: 0.0.0-use.local
   resolution: "@storybook/server@workspace:renderers/server"
   dependencies:
-    "@storybook/csf": "npm:0.1.4--canary.82.2a09ac2.0"
+    "@storybook/csf": "npm:0.1.4--canary.82.eb42c88.0"
     "@storybook/csf-tools": "workspace:*"
     "@storybook/global": "npm:^5.0.0"
     "@storybook/preview-api": "workspace:*"
@@ -6544,7 +6544,7 @@ __metadata:
   version: 0.0.0-use.local
   resolution: "@storybook/source-loader@workspace:lib/source-loader"
   dependencies:
-    "@storybook/csf": "npm:0.1.4--canary.82.2a09ac2.0"
+    "@storybook/csf": "npm:0.1.4--canary.82.eb42c88.0"
     "@storybook/types": "workspace:*"
     estraverse: "npm:^5.2.0"
     lodash: "npm:^4.17.21"
@@ -6723,7 +6723,7 @@ __metadata:
   resolution: "@storybook/types@workspace:lib/types"
   dependencies:
     "@storybook/channels": "workspace:*"
-    "@storybook/csf": "npm:0.1.4--canary.82.2a09ac2.0"
+    "@storybook/csf": "npm:0.1.4--canary.82.eb42c88.0"
     "@types/express": "npm:^4.7.0"
     "@types/fs-extra": "npm:^11.0.1"
     "@types/node": "npm:^18.0.0"