diff --git a/main/plugins/org.talend.core.runtime/src/main/java/org/talend/core/hadoop/api/distribution/hdp/HDP230Distribution.java b/main/plugins/org.talend.core.runtime/src/main/java/org/talend/core/hadoop/api/distribution/hdp/HDP230Distribution.java
index 0f83816554..15ea7739d0 100644
--- a/main/plugins/org.talend.core.runtime/src/main/java/org/talend/core/hadoop/api/distribution/hdp/HDP230Distribution.java
+++ b/main/plugins/org.talend.core.runtime/src/main/java/org/talend/core/hadoop/api/distribution/hdp/HDP230Distribution.java
@@ -95,7 +95,7 @@ public class HDP230Distribution extends AbstractDistribution implements HDFSComp
 
     @Override
     public boolean doSupportEmbeddedMode() {
-        return true;
+        return false;
     }
 
     @Override
diff --git a/main/plugins/org.talend.core.runtime/src/main/java/org/talend/core/hadoop/api/distribution/mapr/MapR500Distribution.java b/main/plugins/org.talend.core.runtime/src/main/java/org/talend/core/hadoop/api/distribution/mapr/MapR500Distribution.java
index 678ab69ee9..9b428ca2a1 100644
--- a/main/plugins/org.talend.core.runtime/src/main/java/org/talend/core/hadoop/api/distribution/mapr/MapR500Distribution.java
+++ b/main/plugins/org.talend.core.runtime/src/main/java/org/talend/core/hadoop/api/distribution/mapr/MapR500Distribution.java
@@ -83,7 +83,7 @@ public class MapR500Distribution extends AbstractMapRDistribution implements HDF
 
     @Override
     public boolean doSupportEmbeddedMode() {
-        return true;
+        return false;
     }
 
     @Override
diff --git a/test/plugins/org.talend.core.runtime.test/src/org/talend/core/hadoop/api/distribution/HadoopComponentTest.java b/test/plugins/org.talend.core.runtime.test/src/org/talend/core/hadoop/api/distribution/HadoopComponentTest.java
index 53792a4dd6..b265eeb613 100644
--- a/test/plugins/org.talend.core.runtime.test/src/org/talend/core/hadoop/api/distribution/HadoopComponentTest.java
+++ b/test/plugins/org.talend.core.runtime.test/src/org/talend/core/hadoop/api/distribution/HadoopComponentTest.java
@@ -546,7 +546,7 @@ public class HadoopComponentTest {
         assertTrue(((PigComponent) hdp230).doSupportHCatalog());
         assertFalse(((PigComponent) hdp230).pigVersionPriorTo_0_12());
         assertTrue(((PigComponent) hdp230).doSupportHBase());
-        assertTrue(((HiveComponent) hdp230).doSupportEmbeddedMode());
+        assertFalse(((HiveComponent) hdp230).doSupportEmbeddedMode());
         assertTrue(((HiveComponent) hdp230).doSupportStandaloneMode());
         assertFalse(((HiveComponent) hdp230).doSupportHive1());
         assertTrue(((HiveComponent) hdp230).doSupportHive2());
@@ -878,7 +878,7 @@ public class HadoopComponentTest {
         assertTrue(((PigComponent) mapr500).doSupportHCatalog());
         assertFalse(((PigComponent) mapr500).pigVersionPriorTo_0_12());
         assertTrue(((PigComponent) mapr500).doSupportHBase());
-        assertTrue(((HiveComponent) mapr500).doSupportEmbeddedMode());
+        assertFalse(((HiveComponent) mapr500).doSupportEmbeddedMode());
         assertTrue(((HiveComponent) mapr500).doSupportStandaloneMode());
         assertFalse(((HiveComponent) mapr500).doSupportHive1());
         assertTrue(((HiveComponent) mapr500).doSupportHive2());