diff --git a/app/kubernetes/converters/application.js b/app/kubernetes/converters/application.js
index cd29a1160..fa45a4a38 100644
--- a/app/kubernetes/converters/application.js
+++ b/app/kubernetes/converters/application.js
@@ -260,7 +260,7 @@ class KubernetesApplicationConverter {
     res.EnvironmentVariables = KubernetesApplicationHelper.generateEnvVariablesFromEnv(app.Env);
     res.PersistedFolders = KubernetesApplicationHelper.generatePersistedFoldersFormValuesFromPersistedFolders(app.PersistedFolders, persistentVolumeClaims); // generate from PVC and app.PersistedFolders
     res.Configurations = KubernetesApplicationHelper.generateConfigurationFormValuesFromEnvAndVolumes(app.Env, app.ConfigurationVolumes, configurations);
-    res.AutoScaler = KubernetesApplicationHelper.generateAutoScalerFormValueFromHorizontalPodAutoScaler(app.AutoScaler);
+    res.AutoScaler = KubernetesApplicationHelper.generateAutoScalerFormValueFromHorizontalPodAutoScaler(app.AutoScaler, res.ReplicaCount);
 
     if (app.ServiceType === KubernetesServiceTypes.LOAD_BALANCER) {
       res.PublishingType = KubernetesApplicationPublishingTypes.LOAD_BALANCER;
diff --git a/app/kubernetes/helpers/application/index.js b/app/kubernetes/helpers/application/index.js
index 8b0513de6..11ab8c2fd 100644
--- a/app/kubernetes/helpers/application/index.js
+++ b/app/kubernetes/helpers/application/index.js
@@ -264,7 +264,7 @@ class KubernetesApplicationHelper {
     return finalRes;
   }
 
-  static generateAutoScalerFormValueFromHorizontalPodAutoScaler(autoScaler) {
+  static generateAutoScalerFormValueFromHorizontalPodAutoScaler(autoScaler, replicasCount) {
     const res = new KubernetesApplicationAutoScalerFormValue();
     if (autoScaler) {
       res.IsUsed = true;
@@ -274,6 +274,8 @@ class KubernetesApplicationHelper {
       res.ApiVersion = autoScaler.ApiVersion;
     } else {
       res.ApiVersion = 'apps/v1';
+      res.MinReplicas = replicasCount;
+      res.MaxReplicas = replicasCount;
     }
     return res;
   }
diff --git a/app/kubernetes/views/applications/create/createApplicationController.js b/app/kubernetes/views/applications/create/createApplicationController.js
index 14feda0db..5b88500c2 100644
--- a/app/kubernetes/views/applications/create/createApplicationController.js
+++ b/app/kubernetes/views/applications/create/createApplicationController.js
@@ -733,9 +733,7 @@ class KubernetesCreateApplicationController {
           });
         }
       } else {
-        this.formValues.AutoScaler = KubernetesApplicationHelper.generateAutoScalerFormValueFromHorizontalPodAutoScaler();
-        this.formValues.AutoScaler.MinReplicas = this.formValues.ReplicaCount;
-        this.formValues.AutoScaler.MaxReplicas = this.formValues.ReplicaCount;
+        this.formValues.AutoScaler = KubernetesApplicationHelper.generateAutoScalerFormValueFromHorizontalPodAutoScaler(null, this.formValues.ReplicaCount);
       }
 
       await this.updateSliders();