diff --git a/client/src/components/layouts/default.tsx b/client/src/components/layouts/default.tsx
index a86eae022a8..3434a007d05 100644
--- a/client/src/components/layouts/default.tsx
+++ b/client/src/components/layouts/default.tsx
@@ -25,6 +25,7 @@ import {
   userSelector,
   isOnlineSelector,
   isServerOnlineSelector,
+  showCodeAllySelector,
   userFetchStateSelector
 } from '../../redux/selectors';
 
@@ -56,6 +57,7 @@ const mapStateToProps = createSelector(
   isOnlineSelector,
   isServerOnlineSelector,
   userFetchStateSelector,
+  showCodeAllySelector,
   userSelector,
   (
     isSignedIn,
@@ -63,6 +65,7 @@ const mapStateToProps = createSelector(
     isOnline: boolean,
     isServerOnline: boolean,
     fetchState: UserFetchState,
+    showCodeAlly: boolean,
     user: User
   ) => ({
     isSignedIn,
@@ -72,6 +75,7 @@ const mapStateToProps = createSelector(
     isServerOnline,
     fetchState,
     theme: user.theme,
+    showCodeAlly,
     user
   })
 );
@@ -98,6 +102,7 @@ interface DefaultLayoutProps extends StateProps, DispatchProps {
   showFooter?: boolean;
   isChallenge?: boolean;
   block?: string;
+  showCodeAlly: boolean;
   superBlock?: string;
   t: TFunction;
 }
@@ -124,6 +129,7 @@ function DefaultLayout({
   superBlock,
   t,
   theme = Themes.Default,
+  showCodeAlly,
   user,
   fetchUser,
   updateAllChallengesInfo
@@ -230,7 +236,7 @@ function DefaultLayout({
             />
           ) : null}
           <SignoutModal />
-          {isChallenge && (
+          {isChallenge && !showCodeAlly && (
             <div className='breadcrumbs-demo'>
               <BreadCrumb
                 block={block as string}
diff --git a/client/src/templates/Challenges/codeally/show.tsx b/client/src/templates/Challenges/codeally/show.tsx
index e2b84b0a984..996045847d9 100644
--- a/client/src/templates/Challenges/codeally/show.tsx
+++ b/client/src/templates/Challenges/codeally/show.tsx
@@ -230,9 +230,6 @@ class ShowCodeAlly extends Component<ShowCodeAllyProps> {
       challenge => challenge.id === challengeId
     );
 
-    const breadcrumbs = document.querySelector('.breadcrumbs-demo');
-    showCodeAlly && breadcrumbs?.remove();
-
     return showCodeAlly ? (
       <LearnLayout>
         <Helmet title={`${blockName}: ${title} | freeCodeCamp.org`} />