--- a/libervia/server/pages.py	Fri Jul 12 14:58:11 2019 +0200
+++ b/libervia/server/pages.py	Sun Jul 14 14:45:51 2019 +0200
@@ -470,6 +470,16 @@
                 .format( *uri_tuple))
         self.uri_callbacks[uri_tuple] = (self, get_uri_cb)
 
+    def getSignalId(self, request):
+        """Retrieve signal_id for a request
+
+        signal_id is used for dynamic page, to associate a initial request with a
+        signal handler. For WebsocketRequest, signal_id attribute is used (which must
+        be orginal request's id)
+        For server.Request it's id(request)
+        """
+        return getattr(request, 'signal_id', id(request))
+
     def registerSignal(self, request, signal, check_profile=True):
         r"""register a signal handler
 
@@ -491,11 +501,12 @@
         if not self.dynamic:
             log.error(_(u"You can't register signal if page is not dynamic"))
             return
-        LiberviaPage.signals_handlers.setdefault(signal, {})[id(request)] = (
+        signal_id = self.getSignalId(request)
+        LiberviaPage.signals_handlers.setdefault(signal, {})[signal_id] = [
             self,
             request,
             check_profile,
-        )
+        ]
         request._signals_registered.append(signal)
 
     def getConfig(self, key, default=None, value_type=None):
@@ -1025,6 +1036,13 @@
         we send all cached signals
         """
         assert request._signals_cache is not None
+        # we need to replace corresponding original requests by this websocket request
+        # in signals_handlers
+        signal_id = request.signal_id
+        for signal_handlers_map in self.__class__.signals_handlers.itervalues():
+            if signal_id in signal_handlers_map:
+                signal_handlers_map[signal_id][1] = request
+
         cache = request._signals_cache
         request._signals_cache = None
         for request, signal, args in cache:
@@ -1036,8 +1054,9 @@
         we remove signal handler
         """
         for signal in request._signals_registered:
+            signal_id = self.getSignalId(request)
             try:
-                del LiberviaPage.signals_handlers[signal][id(request)]
+                del LiberviaPage.signals_handlers[signal][signal_id]
             except KeyError:
                 log.error(_(u"Can't find signal handler for [{signal}], this should not "
                             u"happen").format(signal=signal))
@@ -1208,11 +1227,11 @@
         request.template_data["websocket"] = WebsocketMeta(
             socket_url, socket_token, socket_debug
         )
-        self.host.registerWSToken(socket_token, self, request)
         # we will keep track of handlers to remove
         request._signals_registered = []
         # we will cache registered signals until socket is opened
         request._signals_cache = []
+        self.host.registerWSToken(socket_token, self, request)
 
     def _prepare_render(self, __, request):
         return defer.maybeDeferred(self.prepare_render, self, request)