diff --git a/ui/scripts/instances.js b/ui/scripts/instances.js
index d3c333ee402..b98452b580b 100644
--- a/ui/scripts/instances.js
+++ b/ui/scripts/instances.js
@@ -1861,7 +1861,11 @@
             allowedActions.push("snapshot");
             allowedActions.push("destroy");            
             allowedActions.push("reset");
-            allowedActions.push("scaleUp");
+             
+            //when userVm is running, scaleUp is not supported for KVM
+            if (jsonObj.hypervisor != 'KVM') {
+            	allowedActions.push("scaleUp");
+            }              
 
             if (isAdmin())
                 allowedActions.push("migrate");
@@ -1884,7 +1888,7 @@
             allowedActions.push("destroy");
             allowedActions.push("reset");
             allowedActions.push("snapshot");
-            allowedActions.push("scaleUp");
+            allowedActions.push("scaleUp");  //when vm is stopped, scaleUp is supported for all hypervisors 
             allowedActions.push("changeAffinity");
 
             if (isAdmin())
diff --git a/ui/scripts/system.js b/ui/scripts/system.js
index 87fa46346b4..9eac3401a97 100644
--- a/ui/scripts/system.js
+++ b/ui/scripts/system.js
@@ -16101,8 +16101,16 @@
 
         if (jsonObj.state == 'Running') {
             allowedActions.push("stop");
+            
+            //when systemVm is running, scaleUp is not supported for KVM and XenServer.
+            //however, listRouters API doesn't return hypervisor property....
+            /*
+            if (jsonObj.hypervisor != 'KVM' && jsonObj.hypervisor != 'XenServer') {
+            	allowedActions.push("scaleUp");
+            }  
+            */
             allowedActions.push("scaleUp");
-            //	if(jsonObj.vpcid != null)
+            
             allowedActions.push("restart");
 
             allowedActions.push("viewConsole");
@@ -16110,7 +16118,7 @@
                 allowedActions.push("migrate");
         } else if (jsonObj.state == 'Stopped') {
             allowedActions.push("start");
-            allowedActions.push("scaleUp");
+            allowedActions.push("scaleUp");  //when vm is stopped, scaleUp is supported for all hypervisors 
             allowedActions.push("remove");
         }
         return allowedActions;
@@ -16140,13 +16148,22 @@
             allowedActions.push("stop");
             allowedActions.push("restart");
             allowedActions.push("remove");
+            
+            //when systemVm is running, scaleUp is not supported for KVM and XenServer.            
+            //however, listSystemVms API doesn't return hypervisor property....
+            /*
+            if (jsonObj.hypervisor != 'KVM' && jsonObj.hypervisor != 'XenServer') {
+            	allowedActions.push("scaleUp");
+            }  
+            */
             allowedActions.push("scaleUp");
+            
             allowedActions.push("viewConsole");
             if (isAdmin())
                 allowedActions.push("migrate");
         } else if (jsonObj.state == 'Stopped') {
             allowedActions.push("start");
-            allowedActions.push("scaleUp");            
+            allowedActions.push("scaleUp");  //when vm is stopped, scaleUp is supported for all hypervisors           
             allowedActions.push("remove");
         } else if (jsonObj.state == 'Error') {
             allowedActions.push("remove");