diff --git a/appservice/appservice.go b/appservice/appservice.go
index 924a609ea..7e7c67f53 100644
--- a/appservice/appservice.go
+++ b/appservice/appservice.go
@@ -58,7 +58,7 @@ func NewInternalAPI(
 			},
 		},
 	}
-	js, _, _ := jetstream.Prepare(&base.Cfg.Global.JetStream)
+	js := jetstream.Prepare(&base.Cfg.Global.JetStream)
 
 	// Create a connection to the appservice postgres DB
 	appserviceDB, err := storage.NewDatabase(&base.Cfg.AppServiceAPI.Database)
diff --git a/clientapi/clientapi.go b/clientapi/clientapi.go
index 7c772125a..d678ada96 100644
--- a/clientapi/clientapi.go
+++ b/clientapi/clientapi.go
@@ -49,7 +49,7 @@ func AddPublicRoutes(
 	extRoomsProvider api.ExtraPublicRoomsProvider,
 	mscCfg *config.MSCs,
 ) {
-	js, _, _ := jetstream.Prepare(&cfg.Matrix.JetStream)
+	js := jetstream.Prepare(&cfg.Matrix.JetStream)
 
 	syncProducer := &producers.SyncAPIProducer{
 		JetStream: js,
diff --git a/eduserver/eduserver.go b/eduserver/eduserver.go
index db03001ba..febcf2864 100644
--- a/eduserver/eduserver.go
+++ b/eduserver/eduserver.go
@@ -42,7 +42,7 @@ func NewInternalAPI(
 ) api.EDUServerInputAPI {
 	cfg := &base.Cfg.EDUServer
 
-	js, _, _ := jetstream.Prepare(&cfg.Matrix.JetStream)
+	js := jetstream.Prepare(&cfg.Matrix.JetStream)
 
 	return &input.EDUServerInputAPI{
 		Cache:                        eduCache,
diff --git a/roomserver/roomserver.go b/roomserver/roomserver.go
index 669957be1..e1b84b80c 100644
--- a/roomserver/roomserver.go
+++ b/roomserver/roomserver.go
@@ -50,7 +50,7 @@ func NewInternalAPI(
 		logrus.WithError(err).Panicf("failed to connect to room server db")
 	}
 
-	js, _, _ := jetstream.Prepare(&cfg.Matrix.JetStream)
+	js := jetstream.Prepare(&cfg.Matrix.JetStream)
 
 	return internal.NewRoomserverAPI(
 		cfg, roomserverDB, js,