diff --git a/packages/core/src/components/BaseInput/__stories__/BaseInput.stories.tsx b/packages/core/src/components/BaseInput/__stories__/BaseInput.stories.tsx
index f9ac1d0977..62bb3aed5a 100644
--- a/packages/core/src/components/BaseInput/__stories__/BaseInput.stories.tsx
+++ b/packages/core/src/components/BaseInput/__stories__/BaseInput.stories.tsx
@@ -4,8 +4,7 @@ import BaseInput from "../BaseInput";
 
 const metaSettings = createStoryMetaSettingsDecorator({
   component: BaseInput,
-  isInternal: true,
-  shouldCreateAutodocsPage: true
+  isInternal: true
 });
 
 export default {
diff --git a/packages/storybook-blocks/src/functions/createStoryMetaSettings/createStoryMetaSettings.ts b/packages/storybook-blocks/src/functions/createStoryMetaSettings/createStoryMetaSettings.ts
index 0df0dbc5a8..902a6eee25 100644
--- a/packages/storybook-blocks/src/functions/createStoryMetaSettings/createStoryMetaSettings.ts
+++ b/packages/storybook-blocks/src/functions/createStoryMetaSettings/createStoryMetaSettings.ts
@@ -146,13 +146,9 @@ export function createStoryMetaSettings({
 
 export default createStoryMetaSettings;
 
-function prepareTags(isInternal: boolean = false, shouldCreateAutodocsPage: boolean = false) {
-  const tags: Tag[] = [];
-  if (isInternal) {
-    tags.push('internal');
+function prepareTags(isInternal: boolean = false, shouldCreateAutodocsPage: boolean = true): Tag[] {
+  if (!isInternal) {
+    return [];
   }
-  if (shouldCreateAutodocsPage) {
-    tags.push('autodocs');
-  }
-  return tags;
+  return shouldCreateAutodocsPage ? ['internal', 'autodocs'] : ['internal'];
 }