diff --git a/src/main.js b/src/main.js
index e374e46a..70e9fad0 100644
--- a/src/main.js
+++ b/src/main.js
@@ -151,7 +151,7 @@ ${typeof x[1] === 'string' ? x[1] : JSON.stringify(x[1], null, 4)}`
 FrankerFaceZ.Logger = Logger;
 
 const VER = FrankerFaceZ.version_info = {
-	major: 4, minor: 2, revision: 1,
+	major: 4, minor: 2, revision: 2,
 	commit: __git_commit__,
 	build: __webpack_hash__,
 	toString: () =>
diff --git a/src/sites/twitch-twilight/modules/chat/index.js b/src/sites/twitch-twilight/modules/chat/index.js
index 15b8ce1f..d227036a 100644
--- a/src/sites/twitch-twilight/modules/chat/index.js
+++ b/src/sites/twitch-twilight/modules/chat/index.js
@@ -951,8 +951,8 @@ export default class ChatHook extends Module {
 
 						// When we remove less then expected, we want to keep track
 						// of that so we can return the extra messages from getMessages.
-						this.ffz_extra = target - last;
 						this.buffer = buffer.slice(removed % 2 !== 0 ? Math.max(target - 4, last) : target);
+						this.ffz_extra = buffer.length - count;
 
 					} else {
 						this.ffz_extra = 0;