diff --git a/distribution/src/bin/elasticsearch-service.bat b/distribution/src/bin/elasticsearch-service.bat
index a501f9ba390..90105047d7c 100644
Binary files a/distribution/src/bin/elasticsearch-service.bat and b/distribution/src/bin/elasticsearch-service.bat differ
diff --git a/distribution/tools/launchers/src/main/java/org/elasticsearch/tools/launchers/SystemJvmOptions.java b/distribution/tools/launchers/src/main/java/org/elasticsearch/tools/launchers/SystemJvmOptions.java
index dd84a30c9e3..eb4ab4c4cc0 100644
--- a/distribution/tools/launchers/src/main/java/org/elasticsearch/tools/launchers/SystemJvmOptions.java
+++ b/distribution/tools/launchers/src/main/java/org/elasticsearch/tools/launchers/SystemJvmOptions.java
@@ -24,6 +24,7 @@ import org.elasticsearch.tools.java_version_checker.JavaVersion;
 import java.util.Arrays;
 import java.util.Collections;
 import java.util.List;
+import java.util.stream.Collectors;
 
 final class SystemJvmOptions {
 
@@ -68,7 +69,7 @@ final class SystemJvmOptions {
 
                 javaLocaleProviders()
             )
-        );
+        ).stream().filter(e -> e.isEmpty() == false).collect(Collectors.toList());
     }
 
     private static String maybeShowCodeDetailsInExceptionMessages() {