diff --git a/plugins/scaffolder/src/components/fields/RepoOwnerPicker/RepoOwnerPicker.tsx b/plugins/scaffolder/src/components/fields/RepoOwnerPicker/RepoOwnerPicker.tsx
index ad88b3a02a..024f7f03a1 100644
--- a/plugins/scaffolder/src/components/fields/RepoOwnerPicker/RepoOwnerPicker.tsx
+++ b/plugins/scaffolder/src/components/fields/RepoOwnerPicker/RepoOwnerPicker.tsx
@@ -103,53 +103,49 @@ export const RepoOwnerPicker = (props: RepoOwnerPickerProps) => {
 
   const hostType = (host && integrationApi.byHost(host)?.type) ?? null;
 
-  const renderRepoOwnerPicker = () => {
-    switch (hostType) {
-      case 'github':
-        return (
-          <GitHubRepoOwnerPicker
-            onChange={updateLocalState}
-            state={state}
-            rawErrors={rawErrors}
-            accessToken={
-              uiSchema?.['ui:options']?.requestUserCredentials?.secretsKey &&
-              secrets[uiSchema['ui:options'].requestUserCredentials.secretsKey]
-            }
-            isDisabled={uiSchema?.['ui:disabled'] ?? false}
-            required={required}
-            schema={schema}
-            excludedOwners={excludedOwners}
-          />
-        );
-      case 'gitlab':
-        return (
-          <GitLabRepoOwnerPicker
-            onChange={updateLocalState}
-            state={state}
-            rawErrors={rawErrors}
-            accessToken={
-              uiSchema?.['ui:options']?.requestUserCredentials?.secretsKey &&
-              secrets[uiSchema['ui:options'].requestUserCredentials.secretsKey]
-            }
-            isDisabled={uiSchema?.['ui:disabled'] ?? false}
-            required={required}
-            schema={schema}
-            excludedOwners={excludedOwners}
-          />
-        );
-      default:
-        return (
-          <DefaultRepoOwnerPicker
-            onChange={updateLocalState}
-            state={state}
-            rawErrors={rawErrors}
-            isDisabled={uiSchema?.['ui:disabled'] ?? false}
-            required={required}
-            schema={schema}
-          />
-        );
-    }
-  };
-
-  return renderRepoOwnerPicker();
+  switch (hostType) {
+    case 'github':
+      return (
+        <GitHubRepoOwnerPicker
+          onChange={updateLocalState}
+          state={state}
+          rawErrors={rawErrors}
+          accessToken={
+            uiSchema?.['ui:options']?.requestUserCredentials?.secretsKey &&
+            secrets[uiSchema['ui:options'].requestUserCredentials.secretsKey]
+          }
+          isDisabled={uiSchema?.['ui:disabled'] ?? false}
+          required={required}
+          schema={schema}
+          excludedOwners={excludedOwners}
+        />
+      );
+    case 'gitlab':
+      return (
+        <GitLabRepoOwnerPicker
+          onChange={updateLocalState}
+          state={state}
+          rawErrors={rawErrors}
+          accessToken={
+            uiSchema?.['ui:options']?.requestUserCredentials?.secretsKey &&
+            secrets[uiSchema['ui:options'].requestUserCredentials.secretsKey]
+          }
+          isDisabled={uiSchema?.['ui:disabled'] ?? false}
+          required={required}
+          schema={schema}
+          excludedOwners={excludedOwners}
+        />
+      );
+    default:
+      return (
+        <DefaultRepoOwnerPicker
+          onChange={updateLocalState}
+          state={state}
+          rawErrors={rawErrors}
+          isDisabled={uiSchema?.['ui:disabled'] ?? false}
+          required={required}
+          schema={schema}
+        />
+      );
+  }
 };