diff --git a/lib/commands/query.js b/lib/commands/query.js
index aea860c36c..81531a6037 100644
--- a/lib/commands/query.js
+++ b/lib/commands/query.js
@@ -245,8 +245,8 @@ class Query extends Command {
       stream.emit('error', err); // Pass on any errors
     });
     this.on('end', function () {
-      stream.emit('close'); // notify readers that query has completed
       stream.push(null); // pushing null, indicating EOF
+      stream.emit('close'); // notify readers that query has completed
     });
     this.on('fields', function (fields) {
       stream.emit('fields', fields); // replicate old emitter