diff --git a/server/pubsub/channel.go b/server/pubsub/channel.go
index 63001c5f..33f2a1fa 100644
--- a/server/pubsub/channel.go
+++ b/server/pubsub/channel.go
@@ -111,6 +111,12 @@ func (c *Channel) start() {
 }
 
 func replay(s *Subscription, history []interface{}) {
+	defer func() {
+		if r := recover(); r != nil {
+			log.Println("recoved from panic", r)
+		}
+	}()
+
 	for _, msg := range history {
 		s.send <- msg
 	}