diff --git a/lib/shared/addon/components/gke-node-pool-row/component.js b/lib/shared/addon/components/gke-node-pool-row/component.js
index 39251c43a..6fe27a7d4 100644
--- a/lib/shared/addon/components/gke-node-pool-row/component.js
+++ b/lib/shared/addon/components/gke-node-pool-row/component.js
@@ -68,6 +68,10 @@ export default Component.extend({
           set(this, 'scopeConfig', scopeConfig);
         }
       }
+
+      if (isEmpty(this?.model?.version) && !isEmpty(this?.cluster?.gkeConfig?.kubernetesVersion)) {
+        set(this, 'model.version', this?.cluster?.gkeConfig?.kubernetesVersion);
+      }
     } else {
       setProperties(this, {
         oauthScopesSelection: this.google.oauthScopeOptions.DEFAULT,
@@ -157,6 +161,10 @@ export default Component.extend({
     const clusterVersion         = get(this, 'controlPlaneVersion');
     const nodeVersion            = get(this, 'model.version');
 
+    if (isEmpty(clusterVersion) || isEmpty(nodeVersion)) {
+      return false;
+    }
+
     const initalClusterMinorVersion = parseInt(minor(coerce(clusterVersion)), 10);
     const initalNodeMinorVersion   = parseInt(minor(coerce(nodeVersion)), 10);
     const diff                     = initalClusterMinorVersion - initalNodeMinorVersion;