diff --git a/lib/shared/addon/components/cluster-driver/driver-googlegke/component.js b/lib/shared/addon/components/cluster-driver/driver-googlegke/component.js
index 74f3a3b97..08a9caaed 100644
--- a/lib/shared/addon/components/cluster-driver/driver-googlegke/component.js
+++ b/lib/shared/addon/components/cluster-driver/driver-googlegke/component.js
@@ -304,12 +304,13 @@ export default Component.extend(ClusterDriver, {
   }),
 
   versionChanged: observer('config.masterVersion', 'versionChoices.[]', function() {
-    if (this.saving) {
+    const current = get(this, 'config.masterVersion');
+
+    if (this.saving && current) {
       return;
     }
 
     const versions = get(this, 'versionChoices') || [];
-    const current = get(this, 'config.masterVersion');
     const exists = versions[versions.indexOf(current)];
 
     if ( !exists ) {