diff --git a/lib/storage-handler.js b/lib/storage-handler.js
index 52d1d25..19275a6 100644
--- a/lib/storage-handler.js
+++ b/lib/storage-handler.js
@@ -245,6 +245,9 @@ exports.download = function(provider, req, res, container, file, cb) {
           reader.on('error', function(err) {
             handleError(res, err);
           });
+          reader.on('end', function() {
+            cb();
+          });
         }
       });
 
@@ -258,6 +261,9 @@ exports.download = function(provider, req, res, container, file, cb) {
       reader.on('error', function(err) {
         handleError(res, err);
       });
+      reader.on('end', function() {
+        cb();
+      });
     }
   }
 };
diff --git a/test/upload-download.test.js b/test/upload-download.test.js
index 029378f..8950512 100644
--- a/test/upload-download.test.js
+++ b/test/upload-download.test.js
@@ -249,6 +249,47 @@ describe('storage service', function () {
       .get('/containers/album1/download/test.jpg')
       .expect('Content-Type', 'image/jpeg')
       .expect(200, function (err, res) {
+        if (err) done(err);
+        done();
+      });
+  });
+
+  it('should run a function before a download is started by a client', function(done) {
+    var hookCalled = false;
+
+    var Container = app.models.Container;
+
+    Container.beforeRemote('download', function(ctx, unused, cb) {
+      hookCalled = true;
+      cb();
+    });
+
+    request('http://localhost:' + app.get('port'))
+      .get('/containers/album1/download/test.jpg')
+      .expect('Content-Type', 'image/jpeg')
+      .expect(200, function(err, res) {
+        if (err) done(err);
+        assert(hookCalled, 'beforeRemote hook was not called');
+        done();
+      });
+  });
+
+  it('should run a function after a download is started by a client', function(done) {
+    var hookCalled = false;
+
+    var Container = app.models.Container;
+
+    Container.afterRemote('download', function(ctx, unused, cb) {
+      hookCalled = true;
+      cb();
+    });
+
+    request('http://localhost:' + app.get('port'))
+      .get('/containers/album1/download/test.jpg')
+      .expect('Content-Type', 'image/jpeg')
+      .expect(200, function(err, res) {
+        if (err) done(err);
+        assert(hookCalled, 'afterRemote hook was not called');
         done();
       });
   });