diff --git a/lib/block-store.js b/lib/block-store.js
index 5636e372..05658ccb 100644
--- a/lib/block-store.js
+++ b/lib/block-store.js
@@ -1,4 +1,5 @@
 const b4a = require('b4a')
+const { WRITE_FAILED } = require('hypercore-errors')
 
 module.exports = class BlockStore {
   constructor (storage, tree) {
@@ -54,7 +55,7 @@ module.exports = class BlockStore {
   _write (offset, data) {
     return new Promise((resolve, reject) => {
       this.storage.write(offset, data, (err) => {
-        if (err) reject(err)
+        if (err) reject(WRITE_FAILED(err.message))
         else resolve(offset + data.byteLength)
       })
     })
diff --git a/lib/oplog.js b/lib/oplog.js
index d3333337..16a120f4 100644
--- a/lib/oplog.js
+++ b/lib/oplog.js
@@ -1,7 +1,7 @@
 const cenc = require('compact-encoding')
 const b4a = require('b4a')
 const { crc32 } = require('crc-universal')
-const { OPLOG_CORRUPT, OPLOG_HEADER_OVERFLOW } = require('hypercore-errors')
+const { OPLOG_CORRUPT, OPLOG_HEADER_OVERFLOW, WRITE_FAILED } = require('hypercore-errors')
 
 module.exports = class Oplog {
   constructor (storage, { pageSize = 4096, headerEncoding = cenc.raw, entryEncoding = cenc.raw, readonly = false } = {}) {
@@ -216,7 +216,7 @@ module.exports = class Oplog {
   _append (buf, count) {
     return new Promise((resolve, reject) => {
       this.storage.write(this._entryOffset + this.byteLength, buf, err => {
-        if (err) return reject(err)
+        if (err) return reject(WRITE_FAILED(err.message))
 
         this.byteLength += buf.byteLength
         this.length += count
diff --git a/lib/replicator.js b/lib/replicator.js
index 67dd6a87..7f99b451 100644
--- a/lib/replicator.js
+++ b/lib/replicator.js
@@ -706,6 +706,14 @@ class Peer {
       }
     } catch (err) {
       safetyCatch(err)
+
+      if (err.code === 'WRITE_FAILED') {
+        // For example, we don't want to keep pulling data when storage is full
+        // TODO: notify the user somehow
+        this.paused = true
+        return
+      }
+
       if (this.core.closed && !isCriticalError(err)) return
 
       if (err.code !== 'INVALID_OPERATION') {
diff --git a/package.json b/package.json
index 01b027da..7a36ffd1 100644
--- a/package.json
+++ b/package.json
@@ -44,7 +44,7 @@
     "fast-fifo": "^1.3.0",
     "flat-tree": "^1.9.0",
     "hypercore-crypto": "^3.2.1",
-    "hypercore-errors": "^1.1.0",
+    "hypercore-errors": "^1.1.1",
     "hypercore-id-encoding": "^1.2.0",
     "hypertrace": "^1.2.1",
     "is-options": "^1.0.1",