diff --git a/static/app/routes.tsx b/static/app/routes.tsx
index 39d9a52604f517..4cfcc02277ec4f 100644
--- a/static/app/routes.tsx
+++ b/static/app/routes.tsx
@@ -25,7 +25,7 @@ import {ModuleName} from 'sentry/views/insights/types';
 import {GroupEventDetailsLoading} from 'sentry/views/issueDetails/groupEventDetails/groupEventDetailsLoading';
 import {Tab, TabPaths} from 'sentry/views/issueDetails/types';
 import IssueListContainer from 'sentry/views/issueList';
-import IssueListOverview from 'sentry/views/issueList/overviewFc';
+import {OverviewWrapper} from 'sentry/views/issueList/overviewWrapper';
 import OrganizationContainer from 'sentry/views/organizationContainer';
 import OrganizationLayout from 'sentry/views/organizationLayout';
 import OrganizationRoot from 'sentry/views/organizationRoot';
@@ -1898,8 +1898,8 @@ function buildRoutes() {
 
   const issueListRoutes = (
     <Route path="/issues" component={errorHandler(IssueListContainer)} withOrgPath>
-      <IndexRoute component={errorHandler(IssueListOverview)} />
-      <Route path="searches/:searchId/" component={errorHandler(IssueListOverview)} />
+      <IndexRoute component={errorHandler(OverviewWrapper)} />
+      <Route path="searches/:searchId/" component={errorHandler(OverviewWrapper)} />
     </Route>
   );
 
diff --git a/static/app/views/issueList/overviewWrapper.tsx b/static/app/views/issueList/overviewWrapper.tsx
new file mode 100644
index 00000000000000..21d0ce59a52272
--- /dev/null
+++ b/static/app/views/issueList/overviewWrapper.tsx
@@ -0,0 +1,18 @@
+import type {RouteComponentProps} from 'sentry/types/legacyReactRouter';
+import useOrganization from 'sentry/utils/useOrganization';
+import IssueListOverview from 'sentry/views/issueList/overview';
+import IssueListOverviewFc from 'sentry/views/issueList/overviewFc';
+
+type OverviewWrapperProps = RouteComponentProps<{}, {searchId?: string}>;
+
+// This is a temporary wrapper to allow us to migrate to the refactored issue stream component.
+// Remove once feature flag is retired.
+export function OverviewWrapper(props: OverviewWrapperProps) {
+  const organization = useOrganization();
+
+  if (organization.features.includes('issue-stream-functional-refactor')) {
+    return <IssueListOverviewFc {...props} />;
+  }
+
+  return <IssueListOverview {...props} />;
+}