diff --git a/src/api.js b/src/api.js
index 126baf1c..d34320a7 100644
--- a/src/api.js
+++ b/src/api.js
@@ -1035,9 +1035,9 @@ Module["onRuntimeInitialized"] = function onRuntimeInitialized() {
             stmt.free();
         }
         if (typeof done === "function") {
-            return done();
+            done();
         }
-        return undefined;
+        return this;
     };
 
     /** Prepare an SQL statement
diff --git a/test/test_database.js b/test/test_database.js
index 1759749b..8ab19eec 100644
--- a/test/test_database.js
+++ b/test/test_database.js
@@ -43,6 +43,8 @@ exports.test = function(SQL, assert, done) {
   // Testing db.each
   db.run("CREATE TABLE test (a,b); INSERT INTO test VALUES (1,'a'),(2,'b')");
   var count = 0, finished = false;
+  var chained = db.each("SELECT * FROM test", function () {}, function () {});
+  assert.strictEqual(chained, db, "db.each returns the database object");
   db.each("SELECT * FROM test ORDER BY a", function callback (row){
     count++;
     if (count === 1) assert.deepEqual(row, {a:1,b:'a'}, 'db.each returns the correct 1st row');