diff --git a/presto-pinot-toolkit/src/main/java/com/facebook/presto/pinot/PinotConfig.java b/presto-pinot-toolkit/src/main/java/com/facebook/presto/pinot/PinotConfig.java
index bd16e0469f19..7aa59dd1593c 100644
--- a/presto-pinot-toolkit/src/main/java/com/facebook/presto/pinot/PinotConfig.java
+++ b/presto-pinot-toolkit/src/main/java/com/facebook/presto/pinot/PinotConfig.java
@@ -96,7 +96,7 @@ public class PinotConfig
     // Requires Pinot version >= 0.4.0.
     private boolean usePinotSqlForBrokerQueries = true;
     // Requires Pinot version >= 0.6.0.
-    private boolean useStreamingForSegmentQueries;
+    private boolean useStreamingForSegmentQueries = true;
     private int streamingServerGrpcMaxInboundMessageBytes = DEFAULT_STREAMING_SERVER_GRPC_MAX_INBOUND_MESSAGE_BYTES;
 
     private int numSegmentsPerSplit = 1;
diff --git a/presto-pinot-toolkit/src/test/java/com/facebook/presto/pinot/TestPinotConfig.java b/presto-pinot-toolkit/src/test/java/com/facebook/presto/pinot/TestPinotConfig.java
index 38054b6f0725..152c38009dd9 100644
--- a/presto-pinot-toolkit/src/test/java/com/facebook/presto/pinot/TestPinotConfig.java
+++ b/presto-pinot-toolkit/src/test/java/com/facebook/presto/pinot/TestPinotConfig.java
@@ -72,7 +72,7 @@ public void testDefaults()
                         .setIgnoreEmptyResponses(false)
                         .setUseDateTrunc(false)
                         .setForbidSegmentQueries(false)
-                        .setUseStreamingForSegmentQueries(false)
+                        .setUseStreamingForSegmentQueries(true)
                         .setStreamingServerGrpcMaxInboundMessageBytes(PinotConfig.DEFAULT_STREAMING_SERVER_GRPC_MAX_INBOUND_MESSAGE_BYTES)
                         .setNonAggregateLimitForBrokerQueries(PinotConfig.DEFAULT_NON_AGGREGATE_LIMIT_FOR_BROKER_QUERIES)
                         .setUseDateTrunc(false));
@@ -117,7 +117,7 @@ public void testExplicitPropertyMappings()
                 .put("pinot.pushdown-topn-broker-queries", "false")
                 .put("pinot.pushdown-project-expressions", "false")
                 .put("pinot.forbid-segment-queries", "true")
-                .put("pinot.use-streaming-for-segment-queries", "true")
+                .put("pinot.use-streaming-for-segment-queries", "false")
                 .put("pinot.streaming-server-grpc-max-inbound-message-bytes", "65536")
                 .put("pinot.secure-connection", "true")
                 .put("pinot.override-distinct-count-function", "distinctCountBitmap")
@@ -165,7 +165,7 @@ public void testExplicitPropertyMappings()
                 .setPushdownTopNBrokerQueries(false)
                 .setPushdownProjectExpressions(false)
                 .setForbidSegmentQueries(true)
-                .setUseStreamingForSegmentQueries(true)
+                .setUseStreamingForSegmentQueries(false)
                 .setStreamingServerGrpcMaxInboundMessageBytes(65536)
                 .setUseDateTrunc(true)
                 .setUseProxy(true)