diff --git a/lib/historyKeeper.js b/lib/historyKeeper.js
index a1c09f9aa..b0f06e2fe 100644
--- a/lib/historyKeeper.js
+++ b/lib/historyKeeper.js
@@ -747,7 +747,7 @@ module.exports.create = function (cfg, cb) {
 
             // TODO compute lastKnownHash in a manner such that it will always skip past the metadata line?
             getHistoryAsync(channelName, lastKnownHash, false, (msg, readMore) => {
-                if (!msg) { return; }
+                if (!msg) { return; } // XXX
                 msgCount++;
                 // avoid sending the metadata message a second time
                 if (isMetadataMessage(msg) && metadata_cache[channelName]) { return readMore(); }
diff --git a/package-lock.json b/package-lock.json
index eb4668a33..549bfbe97 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -113,14 +113,13 @@
       }
     },
     "chainpad-server": {
-      "version": "3.0.5",
-      "resolved": "https://registry.npmjs.org/chainpad-server/-/chainpad-server-3.0.5.tgz",
-      "integrity": "sha512-USKOMSHsNjnme81Qy3nQ+ji9eCkBPokYH4T82LVHAI0aayTSCXcTPUDLVGDBCRqe8NsXU4io1WPXn1KiZwB8fA==",
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/chainpad-server/-/chainpad-server-4.0.0.tgz",
+      "integrity": "sha512-HWTdtyzBL/21asK21tf7fivfJm9MDhPz5odq39Az1ibRwZK4Eu+pDcKEHRKEW9KtugQxnFM8NwZoyW9DxAlA8w==",
       "requires": {
-        "nthen": "^0.1.8",
+        "nthen": "0.1.8",
         "pull-stream": "^3.6.9",
         "stream-to-pull-stream": "^1.7.3",
-        "tweetnacl": "~0.12.2",
         "ws": "^3.3.1"
       }
     },
diff --git a/package.json b/package.json
index 057c823d9..ddd98c911 100644
--- a/package.json
+++ b/package.json
@@ -13,7 +13,7 @@
   },
   "dependencies": {
     "chainpad-crypto": "^0.2.2",
-    "chainpad-server": "^3.0.5",
+    "chainpad-server": "^4.0.0",
     "express": "~4.16.0",
     "fs-extra": "^7.0.0",
     "get-folder-size": "^2.0.1",