diff --git a/lib/storage.js b/lib/storage.js
index fcf4414f..1193a1b7 100644
--- a/lib/storage.js
+++ b/lib/storage.js
@@ -382,7 +382,7 @@ Storage.prototype.search = function(startkey, options, callback) {
 
   function remote_search() {
     var uplink = self.uplinks[uplinks[i]]
-    if (!uplink) {
+    if (options.req.query.local !== undefined || !uplink) {
       return merge_with_local_packages(null, null, {})
     }
     self.uplinks[uplinks[i]].request({