diff --git a/container/src/main/java/com/streamsets/datacollector/restapi/PipelineStoreResource.java b/container/src/main/java/com/streamsets/datacollector/restapi/PipelineStoreResource.java
index be7b7f32956..5c27387a1c7 100644
--- a/container/src/main/java/com/streamsets/datacollector/restapi/PipelineStoreResource.java
+++ b/container/src/main/java/com/streamsets/datacollector/restapi/PipelineStoreResource.java
@@ -1786,6 +1786,7 @@ private void setStreamingModeDefaults(PipelineConfiguration pipelineConfig) {
         .add(ImmutableMap.of("key", "spark.executor.memory", "value","2G"))
         .add(ImmutableMap.of("key", "spark.executor.cores", "value","1"))
         .add(ImmutableMap.of("key", "spark.dynamicAllocation.enabled", "value", "true"))
+        .add(ImmutableMap.of("key", "spark.shuffle.service.enabled", "value", "true"))
         .add(ImmutableMap.of("key", "spark.dynamicAllocation.minExecutors", "value", "1"))
         .build();
     Map<String, Config> replacementConfigs = ImmutableMap.<String, Config>builder()