diff --git a/CHANGELOG.md b/CHANGELOG.md
index 3e5bf28a..24aff3cb 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -11,6 +11,7 @@
 * [FEATURE] Added "Cortex / Slow queries" dashboard based on Loki logs. #271
 * [ENHANCEMENT] Add `EtcdAllocatingTooMuchMemory` alert for monitoring etcd memory usage. #261
 * [ENHANCEMENT] Sort legend descending in the CPU/memory panels. #271
+* [ENHANCEMENT] Add config option to enable streaming of chunks in block-based ingesters. #276
 * [BUGFIX] Fixed `CortexQuerierHighRefetchRate` alert. #268
 
 ## 1.7.0 / 2021-02-24
diff --git a/cortex/config.libsonnet b/cortex/config.libsonnet
index 57e34c48..14fc54f9 100644
--- a/cortex/config.libsonnet
+++ b/cortex/config.libsonnet
@@ -433,6 +433,9 @@
     enable_pod_priorities: true,
 
     alertmanager_enabled: false,
+
+    // Enables streaming of chunks from ingesters using blocks.
+    ingester_stream_chunks_when_using_blocks: true,
   },
 
   local configMap = $.core.v1.configMap,
@@ -441,11 +444,9 @@
     configMap.new($._config.overrides_configmap) +
     configMap.withData({
       'overrides.yaml': $.util.manifestYaml(
-        {
-          overrides: $._config.overrides,
-        } + if std.length($._config.multi_kv_config) > 0 then {
-          multi_kv_config: $._config.multi_kv_config,
-        } else {}
+        { overrides: $._config.overrides }
+        + (if std.length($._config.multi_kv_config) > 0 then { multi_kv_config: $._config.multi_kv_config } else {})
+        + (if $._config.ingester_stream_chunks_when_using_blocks then { ingester_stream_chunks_when_using_blocks: true } else {})
       ),
     }),