diff --git a/src/sunstone/public/app/tabs/templates-tab/form-panels/create/wizard-tabs/general/capacity-create.js b/src/sunstone/public/app/tabs/templates-tab/form-panels/create/wizard-tabs/general/capacity-create.js
index a7a37d0f20..52c1576a0a 100644
--- a/src/sunstone/public/app/tabs/templates-tab/form-panels/create/wizard-tabs/general/capacity-create.js
+++ b/src/sunstone/public/app/tabs/templates-tab/form-panels/create/wizard-tabs/general/capacity-create.js
@@ -174,8 +174,10 @@ define(function(require) {
     });
 
     context.on("change", "#VCPU", function(){
-      CoresPerSocket.generateCores(VCPU_SELECTOR);
-      CoresPerSocket.calculateSockets(VCPU_SELECTOR);
+      if ($('#vcenterRadio').is(':checked')){
+        CoresPerSocket.generateCores(VCPU_SELECTOR);
+        CoresPerSocket.calculateSockets(VCPU_SELECTOR);
+      }
       $("#selectedVCPU").val(this.value);
     });