diff --git a/aiogram/contrib/fsm_storage/memory.py b/aiogram/contrib/fsm_storage/memory.py
index 8950aa8e..a5686a34 100644
--- a/aiogram/contrib/fsm_storage/memory.py
+++ b/aiogram/contrib/fsm_storage/memory.py
@@ -105,6 +105,7 @@ class MemoryStorage(BaseStorage):
         self.data[chat][user]['bucket'].update(bucket, **kwargs)
 
     def _cleanup(self, chat, user):
+        chat, user = self.resolve_address(chat=chat, user=user)
         if self.data[chat][user] == {'state': None, 'data': {}, 'bucket': {}}:
             del self.data[chat][user]
         if not self.data[chat]: