diff --git a/awx/ui_next/src/screens/Credential/Credential.jsx b/awx/ui_next/src/screens/Credential/Credential.jsx
index e941b45dcb..1db03ec695 100644
--- a/awx/ui_next/src/screens/Credential/Credential.jsx
+++ b/awx/ui_next/src/screens/Credential/Credential.jsx
@@ -102,6 +102,8 @@ function Credential({ setBreadcrumb }) {
     <PageSection>
       <Card>
         {showCardHeader && <RoutedTabs tabsArray={tabsArray} />}
+        {hasContentLoading && <ContentLoading />}
+        {!hasContentLoading && credential && (
         <Switch>
           <Redirect
             from="/credentials/:id"
@@ -145,6 +147,7 @@ function Credential({ setBreadcrumb }) {
             )}
           </Route>
         </Switch>
+        )}
       </Card>
     </PageSection>
   );