diff --git a/lib/protocol/sequences/Query.js b/lib/protocol/sequences/Query.js
index 04ff25b01..a862a4dd1 100644
--- a/lib/protocol/sequences/Query.js
+++ b/lib/protocol/sequences/Query.js
@@ -193,7 +193,7 @@ Query.prototype.stream = function(options) {
   stream = new Readable(options);
 
   stream._read = function() {
-    self._connection.resume();
+    self._connection && self._connection.resume();
   };
 
   this.on('result',function(row,i) {
diff --git a/test/integration/connection/test-query-stream-before-queue.js b/test/integration/connection/test-query-stream-before-queue.js
new file mode 100644
index 000000000..14ca65d69
--- /dev/null
+++ b/test/integration/connection/test-query-stream-before-queue.js
@@ -0,0 +1,9 @@
+var common = require('../../common');
+var path = require('path')
+var createQuery = require(path.join(common.lib, 'Connection')).createQuery
+
+var query = createQuery('SELECT * FROM some_table')
+var stream = query.stream()
+
+// put the stream into flowing mode
+stream.on('data', function () { })