diff --git a/heron/executor/src/python/heron_executor.py b/heron/executor/src/python/heron_executor.py
index 1f060c1134c..535ccd4777b 100755
--- a/heron/executor/src/python/heron_executor.py
+++ b/heron/executor/src/python/heron_executor.py
@@ -610,11 +610,15 @@ def _get_jvm_instance_options(self, instance_id, component_name, remote_debugger
             java_version.startswith("1.6") or \
             java_version.startswith("1.5"):
       java_metasize_param = 'PermSize'
+    xmn_param = '-Xmn%dM' % xmn_size
+    if self._get_java_major_version() >= 11:
+      # Remove '-Xmn'
+      xmn_param = None
 
     instance_options = [
         '-Xmx%dM' % heap_size_mb,
         '-Xms%dM' % heap_size_mb,
-        '-Xmn%dM' % xmn_size,
+        xmn_param,
         '-XX:Max%s=%dM' % (java_metasize_param, java_metasize_mb),
         '-XX:%s=%dM' % (java_metasize_param, java_metasize_mb),
         '-XX:ReservedCodeCacheSize=%dM' % code_cache_size_mb,
@@ -635,7 +639,7 @@ def _get_jvm_instance_options(self, instance_id, component_name, remote_debugger
     if component_name in self.component_jvm_opts:
       instance_options.extend(self.component_jvm_opts[component_name].split())
 
-    return instance_options
+    return list(filter(None, instance_options))
 
   def _get_jvm_instance_arguments(self, instance_id, component_name, global_task_id,
                                   component_index, remote_debugger_port):
diff --git a/heron/executor/tests/python/heron_executor_unittest.py b/heron/executor/tests/python/heron_executor_unittest.py
index 94f6f90a5ef..4745183189b 100644
--- a/heron/executor/tests/python/heron_executor_unittest.py
+++ b/heron/executor/tests/python/heron_executor_unittest.py
@@ -146,7 +146,7 @@ def get_expected_healthmgr_command():
 
   def get_expected_instance_command(component_name, instance_id, container_id):
     instance_name = "container_%d_%s_%d" % (container_id, component_name, instance_id)
-    return "heron_java_home/bin/java -Xmx320M -Xms320M -Xmn160M -XX:MaxMetaspaceSize=128M " \
+    return "heron_java_home/bin/java -Xmx320M -Xms320M -XX:MaxMetaspaceSize=128M " \
            "-XX:MetaspaceSize=128M -XX:ReservedCodeCacheSize=64M -XX:+PrintCommandLineFlags " \
            "-Djava.net.preferIPv4Stack=true " \
            "-XX:+UseG1GC -XX:+ParallelRefProcEnabled -XX:+UseStringDeduplication " \