diff --git a/src/app/base/components/PageContent/PageContent.tsx b/src/app/base/components/PageContent/PageContent.tsx
index e7d217ae9d..412eeb81e4 100644
--- a/src/app/base/components/PageContent/PageContent.tsx
+++ b/src/app/base/components/PageContent/PageContent.tsx
@@ -5,6 +5,7 @@ import { useSelector } from "react-redux";
 import { matchPath, useLocation } from "react-router-dom-v5-compat";
 
 import AppSidePanel from "../AppSidePanel";
+import ErrorBoundary from "../ErrorBoundary/ErrorBoundary";
 import Footer from "../Footer";
 import MainContentSection from "../MainContentSection";
 import SecondaryNavigation from "../SecondaryNavigation";
@@ -75,7 +76,7 @@ const PageContent = ({
             isNotificationListHidden={isNotificationListHidden}
             {...props}
           >
-            {children}
+            <ErrorBoundary>{children}</ErrorBoundary>
           </MainContentSection>
           <hr />
           <Footer />
diff --git a/src/app/store/machine/reducers.test.ts b/src/app/store/machine/reducers.test.ts
index 175fa555c1..c9be95e27f 100644
--- a/src/app/store/machine/reducers.test.ts
+++ b/src/app/store/machine/reducers.test.ts
@@ -1,5 +1,6 @@
 import { produce } from "immer";
 
+import { DEFAULT_STATUSES } from "./constants";
 import reducers, {
   DEFAULT_COUNT_STATE,
   DEFAULT_LIST_STATE,
@@ -1899,7 +1900,7 @@ describe("machine reducer", () => {
     ).toEqual(
       machineStateFactory({
         ...initialState,
-        statuses: { def456: machineStatusFactory() },
+        statuses: { ...initialState.statuses, abc123: { ...DEFAULT_STATUSES } },
       })
     );
   });
diff --git a/src/app/store/machine/slice.ts b/src/app/store/machine/slice.ts
index 06df884667..42f8f1f1a6 100644
--- a/src/app/store/machine/slice.ts
+++ b/src/app/store/machine/slice.ts
@@ -1648,7 +1648,7 @@ const machineSlice = createSlice({
     ) => {
       action.payload.forEach((id) => {
         // Clean up the statuses for model.
-        delete state.statuses[id];
+        state.statuses[id] = { ...DEFAULT_STATUSES };
       });
     },
     [NodeActions.UNTAG]: generateActionParams<UntagParams>(NodeActions.UNTAG),