@@ -65,6 +65,7 @@ class Receiver extends Writable {
 
     this._totalPayloadLength = 0;
     this._messageLength = 0;
+    this._numFragments = 0;
     this._fragments = [];
 
     this._state = GET_INFO;
@@ -353,21 +354,18 @@ class Receiver extends Writable {
 
     if (this._opcode > 0x07) return this.controlMessage(data);
 
+    if (this._maxFragments > 0 && ++this._numFragments > this._maxFragments) {
+      this._loop = false;
+      return error(RangeError, 'Too many message fragments', false, 1008);
+    }
+
     if (this._compressed) {
       this._state = INFLATING;
       this.decompress(data, cb);
       return;
     }
 
     if (data.length) {
-      if (
-        this._maxFragments > 0 &&
-        this._fragments.length >= this._maxFragments
-      ) {
-        this._loop = false;
-        return error(RangeError, 'Too many message fragments', false, 1008);
-      }
-
       //
       // This message is not compressed so its lenght is the sum of the payload
       // length of all fragments.
@@ -400,15 +398,6 @@ class Receiver extends Writable {
           );
         }
 
-        if (
-          this._maxFragments > 0 &&
-          this._fragments.length >= this._maxFragments
-        ) {
-          return cb(
-            error(RangeError, 'Too many message fragments', false, 1008)
-          );
-        }
-
         this._fragments.push(buf);
       }
 
 
@@ -889,7 +889,7 @@ describe('Receiver', () => {
     });
   });
 
-  it('emits an error if there are too many message fragments (1/2)', (done) => {
+  it('emits an error if there are too many message fragments (1/3)', (done) => {
     const receiver = new Receiver(undefined, {}, 0, 0, 2);
 
     receiver.on('error', (err) => {
@@ -914,7 +914,22 @@ describe('Receiver', () => {
     );
   });
 
-  it('emits an error if there are too many message fragments (2/2)', (done) => {
+  it('emits an error if there are too many message fragments (2/3)', (done) => {
+    const receiver = new Receiver(undefined, {}, 0, 0, 2);
+
+    receiver.on('error', (err) => {
+      assert.ok(err instanceof RangeError);
+      assert.strictEqual(err.message, 'Too many message fragments');
+      assert.strictEqual(err[kStatusCode], 1008);
+      done();
+    });
+
+    receiver.write(Buffer.from([0x02, 0x00]));
+    receiver.write(Buffer.from([0x00, 0x00]));
+    receiver.write(Buffer.from([0x00, 0x00]));
+  });
+
+  it('emits an error if there are too many message fragments (3/3)', (done) => {
     const perMessageDeflate = new PerMessageDeflate();
     perMessageDeflate.accept([{}]);