diff --git a/federationapi/consumers/eduserver.go b/federationapi/consumers/eduserver.go
index 795315715..85d03f50c 100644
--- a/federationapi/consumers/eduserver.go
+++ b/federationapi/consumers/eduserver.go
@@ -71,7 +71,7 @@ func NewOutputEDUConsumer(
 func (t *OutputEDUConsumer) Start() error {
 	if err := jetstream.JetStreamConsumer(
 		t.ctx, t.jetstream, t.typingTopic, t.durable, t.onTypingEvent,
-		nats.DeliverAll(), nats.ManualAck(),
+		nats.DeliverAll(), nats.ManualAck(), nats.HeadersOnly(),
 	); err != nil {
 		return err
 	}
@@ -83,7 +83,7 @@ func (t *OutputEDUConsumer) Start() error {
 	}
 	if err := jetstream.JetStreamConsumer(
 		t.ctx, t.jetstream, t.receiptTopic, t.durable, t.onReceiptEvent,
-		nats.DeliverAll(), nats.ManualAck(),
+		nats.DeliverAll(), nats.ManualAck(), nats.HeadersOnly(),
 	); err != nil {
 		return err
 	}
diff --git a/federationapi/federationapi.go b/federationapi/federationapi.go
index bc360383f..8da6642a8 100644
--- a/federationapi/federationapi.go
+++ b/federationapi/federationapi.go
@@ -63,9 +63,11 @@ func AddPublicRoutes(
 	js, _ := jetstream.Prepare(process, &cfg.Matrix.JetStream)
 	producer := &producers.SyncAPIProducer{
 		JetStream:              js,
-		TopicReceiptEvent:      cfg.Matrix.JetStream.TopicFor(jetstream.OutputReceiptEvent),
-		TopicSendToDeviceEvent: cfg.Matrix.JetStream.TopicFor(jetstream.OutputSendToDeviceEvent),
-		TopicTypingEvent:       cfg.Matrix.JetStream.TopicFor(jetstream.OutputTypingEvent),
+		TopicReceiptEvent:      cfg.Matrix.JetStream.Prefixed(jetstream.OutputReceiptEvent),
+		TopicSendToDeviceEvent: cfg.Matrix.JetStream.Prefixed(jetstream.OutputSendToDeviceEvent),
+		TopicTypingEvent:       cfg.Matrix.JetStream.Prefixed(jetstream.OutputTypingEvent),
+		ServerName:             cfg.Matrix.ServerName,
+		UserAPI:                userAPI,
 	}
 
 	routing.Setup(
diff --git a/syncapi/consumers/eduserver_typing.go b/syncapi/consumers/typing.go
similarity index 100%
rename from syncapi/consumers/eduserver_typing.go
rename to syncapi/consumers/typing.go