diff --git a/client/src/app/Routes.tsx b/client/src/app/Routes.tsx
index 8f8a17307e..9c5ca3bd3d 100644
--- a/client/src/app/Routes.tsx
+++ b/client/src/app/Routes.tsx
@@ -112,11 +112,15 @@ export const adminRoutes: IRoute[] = [
   },
   { comp: Proxies, path: "/proxies", exact: false },
   { comp: MigrationTargets, path: "/migration-targets", exact: false },
-  {
-    comp: Jira,
-    path: Paths.jira,
-    exact: false,
-  },
+  ...(FEATURES_ENABLED.migrationWaves
+    ? [
+        {
+          comp: Jira,
+          path: Paths.jira,
+          exact: false,
+        },
+      ]
+    : []),
 ];
 export const AppRoutes = () => {
   const location = useLocation();
diff --git a/client/src/app/layout/SidebarApp/SidebarApp.tsx b/client/src/app/layout/SidebarApp/SidebarApp.tsx
index 14c7d5dbea..b826e9264d 100644
--- a/client/src/app/layout/SidebarApp/SidebarApp.tsx
+++ b/client/src/app/layout/SidebarApp/SidebarApp.tsx
@@ -163,18 +163,20 @@ export const SidebarApp: React.FC = () => {
               Custom migration targets
             </NavLink>
           </NavItem>
-          <NavExpandable
-            title="Issue management"
-            srText="SR Link"
-            groupId="admin-issue-management"
-            isExpanded
-          >
-            <NavItem>
-              <NavLink to={Paths.jira} activeClassName="pf-m-current">
-                Jira
-              </NavLink>
-            </NavItem>
-          </NavExpandable>
+          {FEATURES_ENABLED.migrationWaves ? (
+            <NavExpandable
+              title="Issue management"
+              srText="SR Link"
+              groupId="admin-issue-management"
+              isExpanded
+            >
+              <NavItem>
+                <NavLink to={Paths.jira} activeClassName="pf-m-current">
+                  Jira
+                </NavLink>
+              </NavItem>
+            </NavExpandable>
+          ) : null}
         </NavList>
       )}
     </Nav>