diff --git a/lib/global-admin/addon/cluster-templates/new-revision/route.js b/lib/global-admin/addon/cluster-templates/new-revision/route.js
index 0a686b2c1..3b64a23a5 100644
--- a/lib/global-admin/addon/cluster-templates/new-revision/route.js
+++ b/lib/global-admin/addon/cluster-templates/new-revision/route.js
@@ -1,7 +1,8 @@
 import Route from '@ember/routing/route';
 import { inject as service } from '@ember/service';
-import { get } from '@ember/object';
+import { get, set } from '@ember/object';
 import { hash } from 'rsvp';
+import { isEmpty } from '@ember/utils';
 
 export default Route.extend({
   globalStore:      service(),
@@ -22,6 +23,10 @@ export default Route.extend({
             tempId       = template.defaultRevisionId;
           }
 
+          if (isEmpty(tempRevision.clusterConfig.rancherKubernetesEngineConfig)) {
+            set(tempRevision, 'clusterConfig.rancherKubernetesEngineConfig', this.globalStore.createRecord({ type: 'rancherKubernetesEngineConfig' }));
+          }
+
           return hash({
             clusterTemplate:           template,
             clusterTemplateRevision:   tempRevision,
@@ -37,6 +42,10 @@ export default Route.extend({
             tempId = get(revisions, 'firstObject').defaultRevisionId;
           }
 
+          if (isEmpty(tempRevision.clusterConfig.rancherKubernetesEngineConfig)) {
+            set(tempRevision, 'clusterConfig.rancherKubernetesEngineConfig', this.globalStore.createRecord({ type: 'rancherKubernetesEngineConfig' }));
+          }
+
           return hash({
             clusterTemplate:           template,
             clusterTemplateRevision:   tempRevision,
diff --git a/lib/shared/addon/components/form-versions/component.js b/lib/shared/addon/components/form-versions/component.js
index 4ddb4bea2..53876d1f3 100644
--- a/lib/shared/addon/components/form-versions/component.js
+++ b/lib/shared/addon/components/form-versions/component.js
@@ -71,7 +71,7 @@ export default Component.extend({
     let maxVersion = maxSatisfying(versions, defaultK8sVersionRange);
 
     if (applyClusterTemplate || clusterTemplateCreate) {
-      var overrideMatch = clusterTemplateQuestions.findBy('variable', 'rancherKubernetesEngineConfig.kubernetesVersion');
+      var overrideMatch = ( clusterTemplateQuestions || [] ).findBy('variable', 'rancherKubernetesEngineConfig.kubernetesVersion');
 
       if (overrideMatch && !isEmpty(overrideMatch.satisfies)) {
         supportedVersionsRange = overrideMatch.satisfies;