diff --git a/src/renderer/components/+custom-resources/crd-resources.tsx b/src/renderer/components/+custom-resources/crd-resources.tsx
index d0eb4779c7..1c8f55aaab 100644
--- a/src/renderer/components/+custom-resources/crd-resources.tsx
+++ b/src/renderer/components/+custom-resources/crd-resources.tsx
@@ -57,9 +57,7 @@ export class CrdResources extends React.Component<Props> {
   }
 
   @computed get store() {
-    if (!this.crd) return null;
-
-    return apiManager.getStore(this.crd.getResourceApiBase());
+    return apiManager.getStore(this.crd?.getResourceApiBase());
   }
 
   render() {
diff --git a/src/renderer/components/+custom-resources/crd.store.ts b/src/renderer/components/+custom-resources/crd.store.ts
index 404dd16eac..2cdcbee55b 100644
--- a/src/renderer/components/+custom-resources/crd.store.ts
+++ b/src/renderer/components/+custom-resources/crd.store.ts
@@ -30,9 +30,9 @@ import { KubeObject } from "../../../common/k8s-api/kube-object";
 
 function initStore(crd: CustomResourceDefinition) {
   const objectConstructor = class extends KubeObject {
-    readonly kind = crd.getResourceKind();
-    readonly namespaced = crd.isNamespaced();
-    readonly apiBase = crd.getResourceApiBase();
+    static readonly kind = crd.getResourceKind();
+    static readonly namespaced = crd.isNamespaced();
+    static readonly apiBase = crd.getResourceApiBase();
   };
 
   const api = apiManager.getApi(objectConstructor.apiBase)