diff --git a/telethon_generator/parser/tl_object.py b/telethon_generator/parser/tl_object.py
index ceb83f83..31c6c4ad 100644
--- a/telethon_generator/parser/tl_object.py
+++ b/telethon_generator/parser/tl_object.py
@@ -249,13 +249,13 @@ class TLArg:
             'int': 'int',
             'long': 'int',
             'string': 'str',
-            'date': 'datetime.datetime',
+            'date': 'datetime.datetime | None',  # None date = 0 timestamp
             'bytes': 'bytes',
             'true': 'bool',
         }.get(self.type, 'TLObject')
         if self.is_vector:
             result = 'list[{}]'.format(result)
-        if self.is_flag:
+        if self.is_flag and self.type != 'date':
             result += ' | None'
 
         return result