diff --git a/pyrogram/client.py b/pyrogram/client.py
index d7c55050..ab4c5945 100644
--- a/pyrogram/client.py
+++ b/pyrogram/client.py
@@ -616,7 +616,7 @@ class Client(Methods):
                 if pts:
                     await self.storage.update_state(
                         (
-                            utils.get_channel_id(channel_id) if channel_id else self.me.id,
+                            utils.get_channel_id(channel_id) if channel_id else 0,
                             pts,
                             None,
                             updates.date,
@@ -656,7 +656,7 @@ class Client(Methods):
         elif isinstance(updates, (raw.types.UpdateShortMessage, raw.types.UpdateShortChatMessage)):
             await self.storage.update_state(
                 (
-                    self.me.id,
+                    0,
                     updates.pts,
                     None,
                     updates.date,
diff --git a/pyrogram/dispatcher.py b/pyrogram/dispatcher.py
index 99c31be0..ccb1f6d7 100644
--- a/pyrogram/dispatcher.py
+++ b/pyrogram/dispatcher.py
@@ -23,6 +23,7 @@ import logging
 from collections import OrderedDict
 
 import pyrogram
+from pyrogram import errors
 from pyrogram import utils
 from pyrogram import raw
 from pyrogram.handlers import (
@@ -268,26 +269,27 @@ class Dispatcher:
                     prev_pts = 0
 
                     while True:
-                        diff = await self.client.invoke(
-                            raw.functions.updates.GetDifference(
-                                pts=local_pts,
-                                date=local_date,
-                                qts=0
-                            ) if id == self.client.me.id else
-                            raw.functions.updates.GetChannelDifference(
-                                channel=await self.client.resolve_peer(id),
-                                filter=raw.types.ChannelMessagesFilterEmpty(),
-                                pts=local_pts,
-                                limit=10000
+                        try:
+                            diff = await self.client.invoke(
+                                raw.functions.updates.GetChannelDifference(
+                                    channel=await self.client.resolve_peer(id),
+                                    filter=raw.types.ChannelMessagesFilterEmpty(),
+                                    pts=local_pts,
+                                    limit=10000
+                                ) if id < 0 else
+                                raw.functions.updates.GetDifference(
+                                    pts=local_pts,
+                                    date=local_date,
+                                    qts=0
+                                )
                             )
-                        )
+                        except (errors.ChannelPrivate, errors.ChannelInvalid):
+                            break
 
-                        if isinstance(diff, (raw.types.updates.DifferenceEmpty, raw.types.updates.ChannelDifferenceEmpty)):
+                        if isinstance(diff, raw.types.updates.DifferenceEmpty):
                             break
-                        elif isinstance(diff, (raw.types.updates.DifferenceTooLong, raw.types.updates.ChannelDifferenceTooLong)):
+                        elif isinstance(diff, raw.types.updates.DifferenceTooLong):
                             break
-                        elif isinstance(diff, raw.types.updates.ChannelDifference):
-                            local_pts = diff.pts
                         elif isinstance(diff, raw.types.updates.Difference):
                             local_pts = diff.state.pts
                         elif isinstance(diff, raw.types.updates.DifferenceSlice):
@@ -298,6 +300,12 @@ class Dispatcher:
                                 break
 
                             prev_pts = local_pts
+                        elif isinstance(diff, raw.types.updates.ChannelDifferenceEmpty):
+                            break
+                        elif isinstance(diff, raw.types.updates.ChannelDifferenceTooLong):
+                            break
+                        elif isinstance(diff, raw.types.updates.ChannelDifference):
+                            local_pts = diff.pts
 
                         users = {i.id: i for i in diff.users}
                         chats = {i.id: i for i in diff.chats}
@@ -330,7 +338,8 @@ class Dispatcher:
                         if isinstance(diff, (raw.types.updates.Difference, raw.types.updates.ChannelDifference)):
                             break
 
-                await self.client.storage.update_state(None)
+                    await self.client.storage.update_state(id)
+
                 log.info("Recovered %s messages and %s updates.", message_updates_counter, other_updates_counter)
 
     async def stop(self):
diff --git a/pyrogram/storage/mongo_storage.py b/pyrogram/storage/mongo_storage.py
index 39952dee..60e45f63 100644
--- a/pyrogram/storage/mongo_storage.py
+++ b/pyrogram/storage/mongo_storage.py
@@ -173,8 +173,8 @@ class MongoStorage(Storage):
             states = [[state['_id'],state['pts'],state['qts'],state['date'],state['seq']] async for state in self._states.find()]
             return states if len(states) > 0 else None
         else:
-            if value is None:
-                await self._states.drop()
+            if isinstance(value, int):
+                await self._states.delete_one({'id': value})
             else:
                 await self._states.update_one({'_id': value[0]}, {'$set': {'pts': value[1], 'qts': value[2], 'date': value[3], 'seq': value[4]}}, upsert=True)
 
diff --git a/pyrogram/storage/sqlite_storage.py b/pyrogram/storage/sqlite_storage.py
index 53c25191..162ef0fd 100644
--- a/pyrogram/storage/sqlite_storage.py
+++ b/pyrogram/storage/sqlite_storage.py
@@ -182,16 +182,17 @@ class SQLiteStorage(Storage):
             ).fetchall()
         else:
             with self.conn:
-                if value is None:
+                if isinstance(value, int):
                     self.conn.execute(
-                        "DELETE FROM update_state"
+                        "DELETE FROM update_state WHERE id = ?",
+                        (value,)
                     )
                 else:
                     self.conn.execute(
-                    "REPLACE INTO update_state (id, pts, qts, date, seq)"
-                    "VALUES (?, ?, ?, ?, ?)",
-                    value
-                )
+                        "REPLACE INTO update_state (id, pts, qts, date, seq)"
+                        "VALUES (?, ?, ?, ?, ?)",
+                        value
+                    )
 
     async def get_peer_by_id(self, peer_id: int):
         r = self.conn.execute(