diff --git a/include/rfb.js b/include/rfb.js
index 0afe656d..ee5e0a35 100644
--- a/include/rfb.js
+++ b/include/rfb.js
@@ -1491,14 +1491,9 @@ var RFB;
                 // We know the encoding and have a whole tile
                 this._FBU.subencoding = rQ[rQi];
                 rQi++;
-                if (this._FBU.subencoding === 0) {
-                    if (this._FBU.lastsubencoding & 0x01) {
-                        // Weird: ignore blanks are RAW
-                        Util.Debug("     Ignoring blank after RAW");
-                    } else {
-                        this._display.fillRect(x, y, w, h, rQ, rQi);
-                        rQi += this._FBU.bytes - 1;
-                    }
+                if ((this._FBU.subencoding === 0) && (this._FBU.lastsubencoding & 0x01)) {
+                    // Weird: ignore blanks are RAW
+                    Util.Debug("     Ignoring blank after RAW");
                 } else if (this._FBU.subencoding & 0x01) {  // Raw
                     this._display.blitImage(x, y, w, h, rQ, rQi);
                     rQi += this._FBU.bytes - 1;
diff --git a/tests/test.rfb.js b/tests/test.rfb.js
index 6233fa8f..5d0418dd 100644
--- a/tests/test.rfb.js
+++ b/tests/test.rfb.js
@@ -1312,6 +1312,21 @@ describe('Remote Frame Buffer Protocol Client', function() {
                         expect(client._display).to.have.displayed(new Uint8Array(expected));
                     });
 
+                    it('should handle a tile with only bg specified and an empty frame afterwards', function () {
+                        var info = [{ x: 0, y: 0, width: 4, height: 4, encoding: 0x05 }];
+                        var rect = [];
+                        rect.push(0x02);
+                        rect.push32(0xff00ff); // becomes 00ff00ff --> #00FF00 bg color
+                        send_fbu_msg(info, [rect], client);
+                        rect.push(0x00);
+                        send_fbu_msg(info, [rect], client);
+
+                        var expected = [];
+                        for (var i = 0; i < 16; i++) { expected.push32(0xff00ff); }     // rect 1: solid
+                        for (var i = 16; i < 32; i++) { expected.push32(0xff00ff); }    // rect 2: same bkground color
+                        expect(client._display).to.have.displayed(new Uint8Array(expected));
+                    });
+
                     it('should handle a tile with bg and coloured subrects', function () {
                         var info = [{ x: 0, y: 0, width: 4, height: 4, encoding: 0x05 }];
                         var rect = [];