diff --git a/src/extensions/registries/cluster-feature-registry.ts b/src/extensions/registries/cluster-feature-registry.ts
index 98ae48619c..f17ee0ff92 100644
--- a/src/extensions/registries/cluster-feature-registry.ts
+++ b/src/extensions/registries/cluster-feature-registry.ts
@@ -1,4 +1,4 @@
-import { observable } from "mobx"
+import { BaseRegistry } from "./base-registry";
 import { ClusterFeature } from "../cluster-feature";
 
 export interface ClusterFeatureComponents {
@@ -11,17 +11,6 @@ export interface ClusterFeatureRegistration {
   feature: ClusterFeature
 }
 
-export class ClusterFeatureRegistry {
-  features = observable.array<ClusterFeatureRegistration>([], { deep: false });
-
-  add(feature: ClusterFeatureRegistration) {
-    this.features.push(feature)
-    return () => {
-      this.features.replace(
-        this.features.filter(f => f !== feature)
-      )
-    };
-  }
-}
+export class ClusterFeatureRegistry extends BaseRegistry<ClusterFeatureRegistration> {}
 
 export const clusterFeatureRegistry = new ClusterFeatureRegistry()
diff --git a/src/renderer/components/+cluster-settings/features.tsx b/src/renderer/components/+cluster-settings/features.tsx
index 8e72932a28..74e6a28f13 100644
--- a/src/renderer/components/+cluster-settings/features.tsx
+++ b/src/renderer/components/+cluster-settings/features.tsx
@@ -14,7 +14,7 @@ export class Features extends React.Component<Props> {
     return (
       <div>
         <h2>Features</h2>
-        { clusterFeatureRegistry.features.map((f) => {
+        { clusterFeatureRegistry.getItems().map((f) => {
           return (
             <InstallFeature cluster={cluster} feature={f.feature}>
               <>