diff --git a/lib/client-api/src/args.test.ts b/lib/client-api/src/args.test.ts
index f0831e630e9..313ca54836c 100644
--- a/lib/client-api/src/args.test.ts
+++ b/lib/client-api/src/args.test.ts
@@ -4,18 +4,53 @@ import { combineArgs, mapArgsToTypes, validateOptions } from './args';
 const stringType = { name: 'string' };
 const numberType = { name: 'number' };
 const booleanType = { name: 'boolean' };
+const enumType = { name: 'enum' };
 const functionType = { name: 'function' };
 const numArrayType = { name: 'array', value: numberType };
 const boolObjectType = { name: 'object', value: { bool: booleanType } };
 
 jest.mock('@storybook/client-logger');
 
+enum ArgsMapTestEnumWithoutInitializer {
+  EnumValue,
+  EnumValue2,
+}
+
+enum ArgsMapTestEnumWithStringInitializer {
+  EnumValue = 'EnumValue',
+}
+
+enum ArgsMapTestEnumWithNumericInitializer {
+  EnumValue = 4,
+}
+
 describe('mapArgsToTypes', () => {
   it('maps strings', () => {
     expect(mapArgsToTypes({ a: 'str' }, { a: { type: stringType } })).toEqual({ a: 'str' });
     expect(mapArgsToTypes({ a: 42 }, { a: { type: stringType } })).toEqual({ a: '42' });
   });
 
+  it('maps enums', () => {
+    expect(
+      mapArgsToTypes({ a: ArgsMapTestEnumWithoutInitializer.EnumValue }, { a: { type: enumType } })
+    ).toEqual({ a: 0 });
+    expect(
+      mapArgsToTypes({ a: ArgsMapTestEnumWithoutInitializer.EnumValue2 }, { a: { type: enumType } })
+    ).toEqual({ a: 1 });
+    expect(
+      mapArgsToTypes(
+        { a: ArgsMapTestEnumWithStringInitializer.EnumValue },
+        { a: { type: enumType } }
+      )
+    ).toEqual({ a: 'EnumValue' });
+    expect(
+      mapArgsToTypes(
+        { a: ArgsMapTestEnumWithNumericInitializer.EnumValue },
+        { a: { type: enumType } }
+      )
+    ).toEqual({ a: 4 });
+  });
+
   it('maps numbers', () => {
     expect(mapArgsToTypes({ a: '42' }, { a: { type: numberType } })).toEqual({ a: 42 });
     expect(mapArgsToTypes({ a: 'a' }, { a: { type: numberType } })).toEqual({ a: NaN });
diff --git a/lib/client-api/src/args.ts b/lib/client-api/src/args.ts
index b0da5ef6f88..e19dc9cbaba 100644
--- a/lib/client-api/src/args.ts
+++ b/lib/client-api/src/args.ts
@@ -12,6 +12,8 @@ const map = (arg: unknown, type: ValueType): any => {
   switch (type.name) {
     case 'string':
       return String(arg);
+    case 'enum':
+      return arg;
     case 'number':
       return Number(arg);
     case 'boolean':