diff --git a/src/main/cluster.ts b/src/main/cluster.ts
index 19f0945c3e..eee88cd6db 100644
--- a/src/main/cluster.ts
+++ b/src/main/cluster.ts
@@ -518,7 +518,8 @@ export class Cluster implements ClusterModel, ClusterState {
       timeout: 0,
       resolveWithFullResponse: false,
       json: true,
-      qs: queryParams,
+      method: "POST",
+      form: queryParams,
     });
   }
 
diff --git a/src/main/node-shell-session.ts b/src/main/node-shell-session.ts
index 0799f9f892..c20567363e 100644
--- a/src/main/node-shell-session.ts
+++ b/src/main/node-shell-session.ts
@@ -26,7 +26,7 @@ export class NodeShellSession extends ShellSession {
 
     if (this.createNodeShellPod(this.podId, this.nodeName)) {
       await this.waitForRunningPod(this.podId).catch(() => {
-        this.exit(1001);
+        this.exitAndClean(1001);
       });
     }
     args = ["exec", "-i", "-t", "-n", "kube-system", this.podId, "--", "sh", "-c", "((clear && bash) || (clear && ash) || (clear && sh))"];
@@ -49,11 +49,14 @@ export class NodeShellSession extends ShellSession {
     appEventBus.emit({name: "node-shell", action: "open"});
   }
 
-  protected exit(code = 1000) {
+  protected exitAndClean(code = 1000) {
     if (this.podId) {
       this.deleteNodeShellPod();
     }
-    super.exit(code);
+
+    if (code != 1000) {
+      this.sendResponse("Error occurred. ");
+    }
   }
 
   protected async createNodeShellPod(podId: string, nodeName: string) {
@@ -65,6 +68,7 @@ export class NodeShellSession extends ShellSession {
         namespace: "kube-system"
       },
       spec: {
+        nodeName,
         restartPolicy: "Never",
         terminationGracePeriodSeconds: 0,
         hostPID: true,
@@ -82,9 +86,6 @@ export class NodeShellSession extends ShellSession {
           command: ["nsenter"],
           args: ["-t", "1", "-m", "-u", "-i", "-n", "sleep", "14000"]
         }],
-        nodeSelector: {
-          "kubernetes.io/hostname": nodeName
-        }
       }
     } as k8s.V1Pod;
 
diff --git a/src/renderer/components/+cluster/cluster-issues.tsx b/src/renderer/components/+cluster/cluster-issues.tsx
index 0aabebaa27..913c78167c 100644
--- a/src/renderer/components/+cluster/cluster-issues.tsx
+++ b/src/renderer/components/+cluster/cluster-issues.tsx
@@ -134,6 +134,7 @@ export class ClusterIssues extends React.Component<Props> {
           <>Warnings: {warnings.length}</>
         </SubHeader>
         <Table
+          tableId="cluster_issues"
           items={warnings}
           virtual
           selectable
diff --git a/src/renderer/components/+namespaces/namespace.store.ts b/src/renderer/components/+namespaces/namespace.store.ts
index f81fee1ece..4415f416b9 100644
--- a/src/renderer/components/+namespaces/namespace.store.ts
+++ b/src/renderer/components/+namespaces/namespace.store.ts
@@ -5,7 +5,7 @@ import { Namespace, namespacesApi } from "../../api/endpoints/namespaces.api";
 import { createPageParam } from "../../navigation";
 import { apiManager } from "../../api/api-manager";
 
-const selectedNamespaces = createStorage<string[]>("selected_namespaces");
+const selectedNamespaces = createStorage<string[] | undefined>("selected_namespaces", undefined);
 
 export const namespaceUrlParam = createPageParam<string[]>({
   name: "namespaces",
diff --git a/src/renderer/components/+pod-security-policies/pod-security-policies.tsx b/src/renderer/components/+pod-security-policies/pod-security-policies.tsx
index affd9f13eb..694d4c2488 100644
--- a/src/renderer/components/+pod-security-policies/pod-security-policies.tsx
+++ b/src/renderer/components/+pod-security-policies/pod-security-policies.tsx
@@ -20,7 +20,7 @@ export class PodSecurityPolicies extends React.Component {
     return (
       <KubeObjectListLayout
         isConfigurable
-        tableId="access_roles"
+        tableId="access_pod_security_policies"
         className="PodSecurityPolicies"
         isClusterScoped={true}
         store={podSecurityPoliciesStore}
diff --git a/src/renderer/components/+storage-volumes/volume-details-list.tsx b/src/renderer/components/+storage-volumes/volume-details-list.tsx
index 91dbcf3dd1..a9fb091050 100644
--- a/src/renderer/components/+storage-volumes/volume-details-list.tsx
+++ b/src/renderer/components/+storage-volumes/volume-details-list.tsx
@@ -64,6 +64,7 @@ export class VolumeDetailsList extends React.Component<Props> {
       <div className="VolumeDetailsList flex column">
         <DrawerTitle title="Persistent Volumes"/>
         <Table
+          tableId="storage_volume_details_list"
           items={persistentVolumes}
           selectable
           virtual={virtual}
diff --git a/src/renderer/components/+workloads-pods/pod-details-list.tsx b/src/renderer/components/+workloads-pods/pod-details-list.tsx
index 6e2bd64c1d..c5d9023334 100644
--- a/src/renderer/components/+workloads-pods/pod-details-list.tsx
+++ b/src/renderer/components/+workloads-pods/pod-details-list.tsx
@@ -135,6 +135,7 @@ export class PodDetailsList extends React.Component<Props> {
       <div className="PodDetailsList flex column">
         {showTitle && <DrawerTitle title="Pods"/>}
         <Table
+          tableId="workloads_pod_details_list"
           items={pods}
           selectable
           virtual={virtual}
diff --git a/src/renderer/components/+workloads-pods/pod-tolerations.tsx b/src/renderer/components/+workloads-pods/pod-tolerations.tsx
index e8d3d7d099..ff464fe1d3 100644
--- a/src/renderer/components/+workloads-pods/pod-tolerations.tsx
+++ b/src/renderer/components/+workloads-pods/pod-tolerations.tsx
@@ -43,6 +43,7 @@ const getTableRow = (toleration: IToleration) => {
 export function PodTolerations({ tolerations }: Props) {
   return (
     <Table
+      tableId="workloads_pod_tolerations"
       selectable
       scrollable={false}
       sortable={sortingCallbacks}
diff --git a/src/renderer/components/dock/dock-tab.store.ts b/src/renderer/components/dock/dock-tab.store.ts
index c951d221fd..34a9b647bb 100644
--- a/src/renderer/components/dock/dock-tab.store.ts
+++ b/src/renderer/components/dock/dock-tab.store.ts
@@ -81,6 +81,6 @@ export class DockTabStore<T> {
 
   reset() {
     this.data.clear();
-    this.storage?.clear();
+    this.storage?.reset();
   }
 }
diff --git a/src/renderer/components/item-object-list/item-list-layout.tsx b/src/renderer/components/item-object-list/item-list-layout.tsx
index ab352361fe..5c7db4cd41 100644
--- a/src/renderer/components/item-object-list/item-list-layout.tsx
+++ b/src/renderer/components/item-object-list/item-list-layout.tsx
@@ -413,7 +413,7 @@ export class ItemListLayout extends React.Component<ItemListLayoutProps> {
   renderList() {
     const {
       store, hasDetailsView, addRemoveButtons = {}, virtual, sortingCallbacks, detailsItem,
-      tableProps = {},
+      tableProps = {}, tableId
     } = this.props;
     const { isReady, removeItemsDialog, items } = this;
     const { selectedItems } = store;
@@ -426,6 +426,7 @@ export class ItemListLayout extends React.Component<ItemListLayoutProps> {
         )}
         {isReady && (
           <Table
+            tableId={tableId}
             virtual={virtual}
             selectable={hasDetailsView}
             sortable={sortingCallbacks}
diff --git a/src/renderer/components/table/table.storage.ts b/src/renderer/components/table/table.storage.ts
new file mode 100644
index 0000000000..e81cbdb30c
--- /dev/null
+++ b/src/renderer/components/table/table.storage.ts
@@ -0,0 +1,22 @@
+import { createStorage } from "../../utils";
+import { TableSortParams } from "./table";
+
+export interface TableStorageModel {
+  sortParams: {
+    [tableId: string]: Partial<TableSortParams>;
+  }
+}
+
+export const tableStorage = createStorage<TableStorageModel>("table_settings", {
+  sortParams: {}
+});
+
+export function getSortParams(tableId: string): Partial<TableSortParams> {
+  return tableStorage.get().sortParams[tableId];
+}
+
+export function setSortParams(tableId: string, sortParams: Partial<TableSortParams>) {
+  tableStorage.merge(draft => {
+    draft.sortParams[tableId] = sortParams;
+  });
+}
diff --git a/src/renderer/components/table/table.tsx b/src/renderer/components/table/table.tsx
index 19bd5b03e5..e15bfabad2 100644
--- a/src/renderer/components/table/table.tsx
+++ b/src/renderer/components/table/table.tsx
@@ -3,7 +3,6 @@ import "./table.scss";
 import React from "react";
 import { orderBy } from "lodash";
 import { observer } from "mobx-react";
-import { observable } from "mobx";
 import { autobind, cssNames, noop } from "../../utils";
 import { TableRow, TableRowElem, TableRowProps } from "./table-row";
 import { TableHead, TableHeadElem, TableHeadProps } from "./table-head";
@@ -11,6 +10,8 @@ import { TableCellElem } from "./table-cell";
 import { VirtualList } from "../virtual-list";
 import { createPageParam } from "../../navigation";
 import { ItemObject } from "../../item.store";
+import { getSortParams, setSortParams } from "./table.storage";
+import { computed } from "mobx";
 
 export type TableSortBy = string;
 export type TableOrderBy = "asc" | "desc" | string;
@@ -19,6 +20,7 @@ export type TableSortCallback<D = any> = (data: D) => string | number | (string
 export type TableSortCallbacks = { [columnId: string]: TableSortCallback };
 
 export interface TableProps extends React.DOMAttributes<HTMLDivElement> {
+  tableId?: string;
   items?: ItemObject[];  // Raw items data
   className?: string;
   autoSize?: boolean;   // Setup auto-sizing for all columns (flex: 1 0)
@@ -62,13 +64,17 @@ export class Table extends React.Component<TableProps> {
     sortSyncWithUrl: true,
   };
 
-  @observable sortParams: Partial<TableSortParams> = Object.assign(
-    this.props.sortSyncWithUrl ? {
-      sortBy: sortByUrlParam.get(),
-      orderBy: orderByUrlParam.get(),
-    } : {},
-    this.props.sortByDefault,
-  );
+  componentDidMount() {
+    const { sortable, tableId } = this.props;
+
+    if (sortable && !tableId) {
+      console.error("[Table]: sorted table requires props.tableId to be specified");
+    }
+  }
+
+  @computed get sortParams() {
+    return Object.assign({}, this.props.sortByDefault, getSortParams(this.props.tableId));
+  }
 
   renderHead() {
     const { sortable, children } = this.props;
@@ -113,7 +119,7 @@ export class Table extends React.Component<TableProps> {
 
   @autobind()
   protected onSort({ sortBy, orderBy }: TableSortParams) {
-    this.sortParams = { sortBy, orderBy };
+    setSortParams(this.props.tableId, { sortBy, orderBy });
     const { sortSyncWithUrl, onSort } = this.props;
 
     if (sortSyncWithUrl) {
diff --git a/src/renderer/hooks/useStorage.ts b/src/renderer/hooks/useStorage.ts
index 6867dcc79a..febda7edb5 100644
--- a/src/renderer/hooks/useStorage.ts
+++ b/src/renderer/hooks/useStorage.ts
@@ -2,7 +2,7 @@ import { useState } from "react";
 import { createStorage } from "../utils";
 import { CreateObservableOptions } from "mobx/lib/api/observable";
 
-export function useStorage<T>(key: string, initialValue?: T, options?: CreateObservableOptions) {
+export function useStorage<T>(key: string, initialValue: T, options?: CreateObservableOptions) {
   const storage = createStorage(key, initialValue, options);
   const [storageValue, setStorageValue] = useState(storage.get());
   const setValue = (value: T) => {
diff --git a/src/renderer/utils/__tests__/storageHelper.test.ts b/src/renderer/utils/__tests__/storageHelper.test.ts
index 8e13543ccd..bf0f19f114 100644
--- a/src/renderer/utils/__tests__/storageHelper.test.ts
+++ b/src/renderer/utils/__tests__/storageHelper.test.ts
@@ -142,17 +142,6 @@ describe("renderer/utils/StorageHelper", () => {
       }));
       expect(storageHelper.get()).toEqual({ ...storageHelperDefaultValue, message: "updated3" });
     });
-
-    it("clears data in storage", () => {
-      storageHelper.init();
-
-      expect(storageHelper.get()).toBeTruthy();
-      storageHelper.clear();
-      expect(storageHelper.get()).toBeFalsy();
-      expect(storageMock[storageKey]).toBeUndefined();
-      expect(storageAdapter.removeItem).toHaveBeenCalledWith(storageHelper.key);
-    });
-
   });
 
   describe("data in storage-helper is observable (mobx)", () => {
diff --git a/src/renderer/utils/createStorage.ts b/src/renderer/utils/createStorage.ts
index 623f657461..2caa3736a4 100755
--- a/src/renderer/utils/createStorage.ts
+++ b/src/renderer/utils/createStorage.ts
@@ -14,7 +14,7 @@ let initialized = false;
 const loaded = observable.box(false);
 const storage = observable.map<string/* key */, any /* serializable */>();
 
-export function createStorage<T>(key: string, defaultValue?: T, observableOptions?: CreateObservableOptions) {
+export function createStorage<T>(key: string, defaultValue: T, observableOptions?: CreateObservableOptions) {
   const clusterId = getHostedClusterId();
   const savingFolder = path.resolve((app || remote.app).getPath("userData"), "lens-local-storage");
   const jsonFilePath = path.resolve(savingFolder, `${clusterId ?? "app"}.json`);
diff --git a/src/renderer/utils/storageHelper.ts b/src/renderer/utils/storageHelper.ts
index f6e6a3d5f9..2b2b14464a 100755
--- a/src/renderer/utils/storageHelper.ts
+++ b/src/renderer/utils/storageHelper.ts
@@ -21,7 +21,7 @@ export interface StorageHelperOptions<T> {
   autoInit?: boolean; // start preloading data immediately, default: true
   observable?: CreateObservableOptions;
   storage: StorageAdapter<T>;
-  defaultValue?: T;
+  defaultValue: T;
 }
 
 export class StorageHelper<T> {
@@ -133,17 +133,18 @@ export class StorageHelper<T> {
   }
 
   set(value: T) {
-    this.data.set(value);
+    if (value == null) {
+      // This cannot use recursion because defaultValue might be null or undefined
+      this.data.set(this.defaultValue);
+    } else {
+      this.data.set(value);
+    }
   }
 
   reset() {
     this.set(this.defaultValue);
   }
 
-  clear() {
-    this.data.set(null);
-  }
-
   merge(value: Partial<T> | ((draft: Draft<T>) => Partial<T> | void)) {
     const nextValue = produce(this.get(), (state: Draft<T>) => {
       const newValue = isFunction(value) ? value(state) : value;