diff --git a/Plugins/ChatFilter/ChatFilter.plugin.js b/Plugins/ChatFilter/ChatFilter.plugin.js
index c8cb360e48..86fa230c84 100644
--- a/Plugins/ChatFilter/ChatFilter.plugin.js
+++ b/Plugins/ChatFilter/ChatFilter.plugin.js
@@ -2,7 +2,7 @@
  * @name ChatFilter
  * @author DevilBro
  * @authorId 278543574059057154
- * @version 3.5.4
+ * @version 3.5.5
  * @description Allows you to censor Words or block complete Messages/Statuses
  * @invite Jx3TjNS
  * @donate https://www.paypal.me/MircoWittrien
@@ -17,12 +17,12 @@ module.exports = (_ => {
 		"info": {
 			"name": "ChatFilter",
 			"author": "DevilBro",
-			"version": "3.5.4",
+			"version": "3.5.5",
 			"description": "Allows you to censor Words or block complete Messages/Statuses"
 		},
 		"changeLog": {
 			"fixed": {
-				"Custom Statuses": ""
+				"Custom Emojis with segmented Searchs": "Custom Emojis no longer cause segmented Searchs to ignore the rest of a sentence"
 			}
 		}
 	};
@@ -502,7 +502,7 @@ module.exports = (_ => {
 				if (nativeEmoji != word) return this.regTest(nativeEmoji, reg);
 				else {
 					let customEmoji = (/<a{0,1}(:.*:)[0-9]{7,}>/i.exec(word) || [])[1];
-					if (customEmoji) return this.regTest(customEmoji, reg);
+					if (customEmoji) return this.regTest(customEmoji, reg) || this.regTest(word, reg);
 					else return this.regTest(word, reg);
 				}
 			}