diff --git a/setup/jetstream/nats.go b/setup/jetstream/nats.go
index e440879c0..a81701fe6 100644
--- a/setup/jetstream/nats.go
+++ b/setup/jetstream/nats.go
@@ -125,15 +125,16 @@ func setupNATS(process *process.ProcessContext, cfg *config.JetStream, nc *natsc
 			// with the subject "Foo", "Foo.Bar" or "Foo.Bar.Baz" etc.
 			subjects = []string{name, name + ".>"}
 		}
-		if info != nil {
-			switch {
-			case !reflect.DeepEqual(info.Config.Subjects, subjects):
-				fallthrough
-			case info.Config.Retention != stream.Retention:
-				fallthrough
-			case info.Config.Storage != stream.Storage:
+		if info != nil && !reflect.DeepEqual(info.Config, stream) {
+			// If the stream config doesn't match what we expect, try to update
+			// it. If that doesn't work then try to blow it away and we'll then
+			// recreate it in the next section.
+			if info, err = s.UpdateStream(stream); err != nil {
+				logrus.WithError(err).Warnf("Unable to update stream %q, recreating...", name)
+				// We failed to update the stream, this is a last attempt to get
+				// things working but may result in data loss.
 				if err = s.DeleteStream(name); err != nil {
-					logrus.WithError(err).Fatal("Unable to delete stream")
+					logrus.WithError(err).Fatalf("Unable to delete stream %q", name)
 				}
 				info = nil
 			}
diff --git a/setup/jetstream/streams.go b/setup/jetstream/streams.go
index 590f0cbd9..741407926 100644
--- a/setup/jetstream/streams.go
+++ b/setup/jetstream/streams.go
@@ -48,6 +48,7 @@ var streams = []*nats.StreamConfig{
 		Name:      InputRoomEvent,
 		Retention: nats.InterestPolicy,
 		Storage:   nats.FileStorage,
+		MaxAge:    time.Hour * 24,
 	},
 	{
 		Name:      InputDeviceListUpdate,