diff --git a/lib/Connection.js b/lib/Connection.js
index d04fbfff7..700660482 100644
--- a/lib/Connection.js
+++ b/lib/Connection.js
@@ -39,7 +39,7 @@ Connection.createQuery = function(sql, values, cb) {
     options = sql;
     if (typeof values === 'function') {
       cb = values;
-    } else {
+    } else if (typeof values !== 'undefined') {
       options.values = values;
     }
   } else if (typeof values === 'function') {
diff --git a/test/integration/connection/test-query-options-object-stream.js b/test/integration/connection/test-query-options-object-stream.js
new file mode 100644
index 000000000..9b72c4cf9
--- /dev/null
+++ b/test/integration/connection/test-query-options-object-stream.js
@@ -0,0 +1,28 @@
+var common     = require('../../common');
+var connection = common.createConnection();
+var assert     = require('assert');
+
+connection.connect();
+
+var rows = undefined;
+var fields = undefined;
+var query = connection.query({
+  sql: 'SELECT ?',
+  values: [ 1 ]
+});
+query.on('error', function (err) {
+  throw err;
+});
+query.on('fields', function (_fields) {
+  fields = _fields;
+});
+query.on('result', function (_rows) {
+  rows = [ _rows ];
+});
+
+connection.end();
+
+process.on('exit', function() {
+  assert.deepEqual(rows, [{1: 1}]);
+  assert.equal(fields[0].name, '1');
+});