diff --git a/awx/ui_next/src/components/AddRole/SelectResourceStep.js b/awx/ui_next/src/components/AddRole/SelectResourceStep.js
index 644dc45e80..f41f179554 100644
--- a/awx/ui_next/src/components/AddRole/SelectResourceStep.js
+++ b/awx/ui_next/src/components/AddRole/SelectResourceStep.js
@@ -1,6 +1,6 @@
 import React, { useCallback, useEffect } from 'react';
 import PropTypes from 'prop-types';
-import { withRouter, useLocation } from 'react-router-dom';
+import { useLocation } from 'react-router-dom';
 import { t } from '@lingui/macro';
 import useRequest from 'hooks/useRequest';
 import { SearchColumns, SortColumns } from 'types';
@@ -148,4 +148,4 @@ SelectResourceStep.defaultProps = {
 };
 
 export { SelectResourceStep as _SelectResourceStep };
-export default withRouter(SelectResourceStep);
+export default SelectResourceStep;
diff --git a/awx/ui_next/src/components/Lookup/ApplicationLookup.js b/awx/ui_next/src/components/Lookup/ApplicationLookup.js
index fd09c87a04..51c4bc23a5 100644
--- a/awx/ui_next/src/components/Lookup/ApplicationLookup.js
+++ b/awx/ui_next/src/components/Lookup/ApplicationLookup.js
@@ -1,6 +1,6 @@
 import React, { useCallback, useEffect } from 'react';
 import { func, node, string } from 'prop-types';
-import { withRouter, useLocation } from 'react-router-dom';
+import { useLocation } from 'react-router-dom';
 import { t } from '@lingui/macro';
 import { FormGroup } from '@patternfly/react-core';
 import { ApplicationsAPI } from 'api';
@@ -151,4 +151,4 @@ ApplicationLookup.defaultProps = {
   fieldName: 'application',
 };
 
-export default withRouter(ApplicationLookup);
+export default ApplicationLookup;
diff --git a/awx/ui_next/src/components/Lookup/HostFilterLookup.js b/awx/ui_next/src/components/Lookup/HostFilterLookup.js
index cc14a0dccb..4b5d3a324e 100644
--- a/awx/ui_next/src/components/Lookup/HostFilterLookup.js
+++ b/awx/ui_next/src/components/Lookup/HostFilterLookup.js
@@ -1,5 +1,5 @@
 import React, { useState, useEffect, useCallback } from 'react';
-import { withRouter, useHistory, useLocation } from 'react-router-dom';
+import { useHistory, useLocation } from 'react-router-dom';
 import { number, func, bool, string } from 'prop-types';
 
 import styled from 'styled-components';
@@ -411,4 +411,4 @@ HostFilterLookup.defaultProps = {
   enableRelatedFuzzyFiltering: true,
 };
 
-export default withRouter(HostFilterLookup);
+export default HostFilterLookup;
diff --git a/awx/ui_next/src/screens/Job/Job.js b/awx/ui_next/src/screens/Job/Job.js
index 0289c8c32c..f92df64385 100644
--- a/awx/ui_next/src/screens/Job/Job.js
+++ b/awx/ui_next/src/screens/Job/Job.js
@@ -1,7 +1,6 @@
 import React, { useEffect, useCallback } from 'react';
 import {
   Route,
-  withRouter,
   Switch,
   Redirect,
   Link,
@@ -173,5 +172,5 @@ function Job({ setBreadcrumb }) {
   );
 }
 
-export default withRouter(Job);
+export default Job;
 export { Job as _Job };
diff --git a/awx/ui_next/src/screens/Job/JobOutput/JobOutput.js b/awx/ui_next/src/screens/Job/JobOutput/JobOutput.js
index 7bf74ce7c6..642481660d 100644
--- a/awx/ui_next/src/screens/Job/JobOutput/JobOutput.js
+++ b/awx/ui_next/src/screens/Job/JobOutput/JobOutput.js
@@ -1,5 +1,5 @@
 import React, { useCallback, useEffect, useRef, useState } from 'react';
-import { useHistory, useLocation, withRouter } from 'react-router-dom';
+import { useHistory, useLocation } from 'react-router-dom';
 import { t } from '@lingui/macro';
 import styled from 'styled-components';
 import {
@@ -948,4 +948,4 @@ function JobOutput({ job, eventRelatedSearchableKeys, eventSearchableKeys }) {
 }
 
 export { JobOutput as _JobOutput };
-export default withRouter(JobOutput);
+export default JobOutput;
diff --git a/awx/ui_next/src/screens/Organization/Organization.js b/awx/ui_next/src/screens/Organization/Organization.js
index 376aa6617f..255f1ec05e 100644
--- a/awx/ui_next/src/screens/Organization/Organization.js
+++ b/awx/ui_next/src/screens/Organization/Organization.js
@@ -4,7 +4,6 @@ import { t } from '@lingui/macro';
 import {
   Switch,
   Route,
-  withRouter,
   Redirect,
   Link,
   useLocation,
@@ -235,5 +234,5 @@ function Organization({ setBreadcrumb, me }) {
   );
 }
 
-export default withRouter(Organization);
+export default Organization;
 export { Organization as _Organization };
diff --git a/awx/ui_next/src/screens/Project/Project.js b/awx/ui_next/src/screens/Project/Project.js
index f88385169e..8426ef59df 100644
--- a/awx/ui_next/src/screens/Project/Project.js
+++ b/awx/ui_next/src/screens/Project/Project.js
@@ -4,7 +4,6 @@ import { t } from '@lingui/macro';
 import {
   Switch,
   Route,
-  withRouter,
   Redirect,
   Link,
   useParams,
@@ -206,5 +205,5 @@ function Project({ setBreadcrumb }) {
   );
 }
 
-export default withRouter(Project);
+export default Project;
 export { Project as _Project };