@@ -273,11 +273,15 @@ def regex(pattern, flags: int = 0):
                 RegEx flags.
         """
 
-        def f(_, m):
-            m.matches = [i for i in _.p.finditer(m.text or m.caption or "")]
-            return bool(m.matches)
+        def func(flt, message):
+            text = message.text or message.caption
+
+            if text:
+                message.matches = list(flt.p.finditer(text)) or None
+
+            return bool(message.matches)
 
-        return create(f, "RegexFilter", p=re.compile(pattern, flags))
+        return create(func, "RegexFilter", p=re.compile(pattern, flags))
 
     # noinspection PyPep8Naming
     class user(Filter, set):