diff --git a/setup/jetstream/streams.go b/setup/jetstream/streams.go
index 326e62a93..141c420fa 100644
--- a/setup/jetstream/streams.go
+++ b/setup/jetstream/streams.go
@@ -17,14 +17,14 @@ var (
 
 var streams = []*nats.StreamConfig{
 	{
-		Name:      OutputRoomEvent,
-		Retention: nats.InterestPolicy,
-		Storage:   nats.FileStorage,
+		Name: OutputRoomEvent,
+		//Retention: nats.InterestPolicy,
+		Storage: nats.FileStorage,
 	},
 	{
-		Name:      OutputSendToDeviceEvent,
-		Retention: nats.InterestPolicy,
-		Storage:   nats.FileStorage,
+		Name: OutputSendToDeviceEvent,
+		//Retention: nats.InterestPolicy,
+		Storage: nats.FileStorage,
 	},
 	{
 		Name:      OutputKeyChangeEvent,
@@ -32,19 +32,19 @@ var streams = []*nats.StreamConfig{
 		Storage:   nats.FileStorage,
 	},
 	{
-		Name:      OutputTypingEvent,
-		Retention: nats.InterestPolicy,
-		Storage:   nats.MemoryStorage,
-		MaxAge:    time.Second * 60,
+		Name: OutputTypingEvent,
+		//Retention: nats.InterestPolicy,
+		Storage: nats.MemoryStorage,
+		MaxAge:  time.Second * 60,
 	},
 	{
-		Name:      OutputClientData,
-		Retention: nats.InterestPolicy,
-		Storage:   nats.FileStorage,
+		Name: OutputClientData,
+		//Retention: nats.InterestPolicy,
+		Storage: nats.FileStorage,
 	},
 	{
-		Name:      OutputReceiptEvent,
-		Retention: nats.InterestPolicy,
-		Storage:   nats.FileStorage,
+		Name: OutputReceiptEvent,
+		//Retention: nats.InterestPolicy,
+		Storage: nats.FileStorage,
 	},
 }