diff --git a/app/react/kubernetes/applications/ListView/ApplicationsStacksDatatable/ApplicationsStacksDatatable.tsx b/app/react/kubernetes/applications/ListView/ApplicationsStacksDatatable/ApplicationsStacksDatatable.tsx
index 4b717db45..b128501a2 100644
--- a/app/react/kubernetes/applications/ListView/ApplicationsStacksDatatable/ApplicationsStacksDatatable.tsx
+++ b/app/react/kubernetes/applications/ListView/ApplicationsStacksDatatable/ApplicationsStacksDatatable.tsx
@@ -77,14 +77,12 @@ export function ApplicationsStacksDatatable({
               namespaces={namespaces}
               value={namespace}
               onChange={onNamespaceChange}
-              showSystem={tableState.showSystemResources}
+              showSystem={showSystem}
             />
           </div>
 
           <div className="space-y-2">
-            <SystemResourceDescription
-              showSystemResources={tableState.showSystemResources}
-            />
+            <SystemResourceDescription showSystemResources={showSystem} />
           </div>
         </div>
       }
diff --git a/app/react/kubernetes/applications/ListView/ApplicationsStacksDatatable/NamespaceFilter.tsx b/app/react/kubernetes/applications/ListView/ApplicationsStacksDatatable/NamespaceFilter.tsx
index ffa9b67f9..283983afa 100644
--- a/app/react/kubernetes/applications/ListView/ApplicationsStacksDatatable/NamespaceFilter.tsx
+++ b/app/react/kubernetes/applications/ListView/ApplicationsStacksDatatable/NamespaceFilter.tsx
@@ -7,13 +7,17 @@ import { InputGroup } from '@@/form-components/InputGroup';
 
 import { Namespace } from './types';
 
-function transformNamespaces(namespaces: Namespace[], showSystem: boolean) {
-  return namespaces
-    .filter((ns) => showSystem || !ns.IsSystem)
-    .map(({ Name, IsSystem }) => ({
-      label: IsSystem ? `${Name} - system` : Name,
-      value: Name,
-    }));
+function transformNamespaces(namespaces: Namespace[], showSystem?: boolean) {
+  const transformedNamespaces = namespaces.map(({ Name, IsSystem }) => ({
+    label: IsSystem ? `${Name} - system` : Name,
+    value: Name,
+    isSystem: IsSystem,
+  }));
+  if (showSystem === undefined) {
+    return transformedNamespaces;
+  }
+  // only filter when showSystem is set
+  return transformedNamespaces.filter((ns) => showSystem || !ns.isSystem);
 }
 
 export function NamespaceFilter({
@@ -25,19 +29,22 @@ export function NamespaceFilter({
   namespaces: Namespace[];
   value: string;
   onChange: (value: string) => void;
-  showSystem: boolean;
+  showSystem?: boolean;
 }) {
   const transformedNamespaces = transformNamespaces(namespaces, showSystem);
 
   // sync value with displayed namespaces
   useEffect(() => {
     const names = transformedNamespaces.map((ns) => ns.value);
-    if (value && !names.find((ns) => ns === value)) {
-      onChange(
-        names.length > 0 ? names.find((ns) => ns === 'default') || names[0] : ''
-      );
+    const isSelectedNamespaceFound = names.some((ns) => ns === value);
+    if (value && !isSelectedNamespaceFound) {
+      const newNamespaceValue =
+        names.length > 0
+          ? names.find((ns) => ns === 'default') || names[0]
+          : '';
+      onChange(newNamespaceValue);
     }
-  }, [value, onChange, transformedNamespaces]);
+  }, [value, onChange, transformedNamespaces, showSystem]);
 
   return (
     <InputGroup>
diff --git a/app/react/kubernetes/datatables/SystemResourceDescription.tsx b/app/react/kubernetes/datatables/SystemResourceDescription.tsx
index 052b8b0d9..3aae630f8 100644
--- a/app/react/kubernetes/datatables/SystemResourceDescription.tsx
+++ b/app/react/kubernetes/datatables/SystemResourceDescription.tsx
@@ -3,11 +3,11 @@ import { Authorized } from '@/react/hooks/useUser';
 import { TextTip } from '@@/Tip/TextTip';
 
 interface Props {
-  showSystemResources: boolean;
+  showSystemResources?: boolean;
 }
 
 export function SystemResourceDescription({ showSystemResources }: Props) {
-  return !showSystemResources ? (
+  return showSystemResources === false ? (
     <Authorized authorizations="K8sAccessSystemNamespaces" adminOnlyCE>
       <TextTip color="blue" className="!mb-0">
         System resources are hidden, this can be changed in the table settings