diff --git a/package.json b/package.json
index d664586b..9ea6f543 100644
--- a/package.json
+++ b/package.json
@@ -29,7 +29,7 @@
   ],
   "homepage": "https://github.com/ipfs/js-ipfs-repo",
   "devDependencies": {
-    "aegir": "^2.1.0",
+    "aegir": "^2.1.1",
     "async": "^1.5.2",
     "bl": "^1.1.2",
     "bs58": "^3.0.0",
diff --git a/src/stores/config.js b/src/stores/config.js
index d24e0345..9ab74943 100644
--- a/src/stores/config.js
+++ b/src/stores/config.js
@@ -31,7 +31,7 @@ exports.setUp = (basePath, blobStore, locks) => {
         }
 
         store.createWriteStream('config')
-          .on('finish', () => {
+          .once('finish', () => {
             locks.unlock(callback)
           })
           .end(JSON.stringify(config, null, 2))
diff --git a/src/stores/locks.js b/src/stores/locks.js
index 6830408a..42dcdcb9 100644
--- a/src/stores/locks.js
+++ b/src/stores/locks.js
@@ -11,7 +11,7 @@ exports.setUp = (basePath, blobStore) => {
       function createLock () {
         store
           .createWriteStream(lockFile)
-          .on('finish', () => {
+          .once('finish', () => {
             cb()
           })
           .end()
diff --git a/src/stores/version.js b/src/stores/version.js
index 5513faf9..66744d4d 100644
--- a/src/stores/version.js
+++ b/src/stores/version.js
@@ -28,7 +28,7 @@ exports.setUp = (basePath, blobStore, locks) => {
         }
 
         store.createWriteStream('version')
-          .on('finish', () => {
+          .once('finish', () => {
             locks.unlock(callback)
           })
           .end(value)