diff --git a/passbook/root/messages/consumer.py b/passbook/root/messages/consumer.py
index 04874c1cf..4c0250c04 100644
--- a/passbook/root/messages/consumer.py
+++ b/passbook/root/messages/consumer.py
@@ -9,11 +9,11 @@ class MessageConsumer(JsonWebsocketConsumer):
 
     def connect(self):
         self.accept()
-        cache.set(f"user_{self.scope['user'].pk}_{self.channel_name}", True)
+        cache.set(f"user_{self.scope['user'].pk}_messages_{self.channel_name}", True)
 
     # pylint: disable=unused-argument
     def disconnect(self, close_code):
-        cache.delete(f"user_{self.scope['user'].pk}_{self.channel_name}")
+        cache.delete(f"user_{self.scope['user'].pk}_messages_{self.channel_name}")
 
     def event_update(self, event: dict):
         """Event handler which is called by Messages Storage backend"""
diff --git a/passbook/root/messages/storage.py b/passbook/root/messages/storage.py
index 0b7a40b44..7df02f123 100644
--- a/passbook/root/messages/storage.py
+++ b/passbook/root/messages/storage.py
@@ -1,12 +1,13 @@
 """Channels Messages storage"""
 from asgiref.sync import async_to_sync
 from channels.layers import get_channel_layer
-from django.contrib.messages.storage.base import BaseStorage, Message
+from django.contrib.messages.storage.base import Message
+from django.contrib.messages.storage.session import SessionStorage
 from django.core.cache import cache
 from django.http.request import HttpRequest
 
 
-class ChannelsStorage(BaseStorage):
+class ChannelsStorage(SessionStorage):
     """Send contrib.messages over websocket"""
 
     def __init__(self, request: HttpRequest) -> None:
@@ -15,7 +16,7 @@ class ChannelsStorage(BaseStorage):
         self.channel = get_channel_layer()
 
     def _store(self, messages: list[Message], response, *args, **kwargs):
-        prefix = f"user_{self.request.user.pk}_"
+        prefix = f"user_{self.request.user.pk}_messages_"
         keys = cache.keys(f"{prefix}*")
         for key in keys:
             uid = key.replace(prefix, "")
@@ -29,6 +30,4 @@ class ChannelsStorage(BaseStorage):
                         "message": message.message,
                     },
                 )
-
-    def _get(self, *args, **kwargs):
-        return [], True
+        return super()._store(messages, response, *args, **kwargs)