diff --git a/src/renderer/components/cluster-settings/cluster-settings.tsx b/src/renderer/components/cluster-settings/cluster-settings.tsx
index 21081bc5ce..ce9822b26c 100644
--- a/src/renderer/components/cluster-settings/cluster-settings.tsx
+++ b/src/renderer/components/cluster-settings/cluster-settings.tsx
@@ -42,7 +42,7 @@ export function GeneralSettings({ entity }: EntitySettingViewProps) {
       <section>
         <div className="flex">
           <div className="flex-grow pr-8">
-            <components.ClusterNameSetting cluster={cluster} />
+            <components.ClusterNameSetting cluster={cluster} entity={entity as KubernetesCluster} />
           </div>
           <div>
             <components.ClusterIconSetting cluster={cluster} entity={entity as KubernetesCluster} />
diff --git a/src/renderer/components/cluster-settings/components/cluster-name-setting.tsx b/src/renderer/components/cluster-settings/components/cluster-name-setting.tsx
index cd6a6a7032..0ed41106ab 100644
--- a/src/renderer/components/cluster-settings/components/cluster-name-setting.tsx
+++ b/src/renderer/components/cluster-settings/components/cluster-name-setting.tsx
@@ -26,9 +26,11 @@ import { observable, autorun, makeObservable } from "mobx";
 import { observer, disposeOnUnmount } from "mobx-react";
 import { SubTitle } from "../../layout/sub-title";
 import { isRequired } from "../../input/input_validators";
+import type { KubernetesCluster } from "../../../../common/catalog-entities";
 
 interface Props {
   cluster: Cluster;
+  entity: KubernetesCluster;
 }
 
 @observer
@@ -43,7 +45,7 @@ export class ClusterNameSetting extends React.Component<Props> {
   componentDidMount() {
     disposeOnUnmount(this,
       autorun(() => {
-        this.name = this.props.cluster.preferences.clusterName;
+        this.name = this.props.cluster.preferences.clusterName || this.props.entity.metadata.name;
       })
     );
   }