diff --git a/federationsender/consumers/roomserver.go b/federationsender/consumers/roomserver.go
index 67d08b339..cc0873898 100644
--- a/federationsender/consumers/roomserver.go
+++ b/federationsender/consumers/roomserver.go
@@ -177,7 +177,7 @@ func (s *OutputRoomEventConsumer) processMessage(ore api.OutputNewRoomEvent) err
 
 	// Send the event.
 	return s.queues.SendEvent(
-		&ore.Event, gomatrixserverlib.ServerName(ore.SendAsServer), joinedHostsAtEvent,
+		ore.Event, gomatrixserverlib.ServerName(ore.SendAsServer), joinedHostsAtEvent,
 	)
 }
 
@@ -204,7 +204,7 @@ func (s *OutputRoomEventConsumer) processInvite(oie api.OutputNewInviteEvent) er
 	}
 
 	// Send the event.
-	return s.queues.SendInvite(&inviteReq)
+	return s.queues.SendInvite(inviteReq)
 }
 
 // joinedHostsAtEvent works out a list of matrix servers that were joined to
diff --git a/federationsender/queue/queue.go b/federationsender/queue/queue.go
index cdcd0da81..d6b9b0e7a 100644
--- a/federationsender/queue/queue.go
+++ b/federationsender/queue/queue.go
@@ -50,7 +50,7 @@ func NewOutgoingQueues(
 
 // SendEvent sends an event to the destinations
 func (oqs *OutgoingQueues) SendEvent(
-	ev *gomatrixserverlib.HeaderedEvent, origin gomatrixserverlib.ServerName,
+	ev gomatrixserverlib.HeaderedEvent, origin gomatrixserverlib.ServerName,
 	destinations []gomatrixserverlib.ServerName,
 ) error {
 	if origin != oqs.origin {
@@ -84,7 +84,7 @@ func (oqs *OutgoingQueues) SendEvent(
 			oqs.queuesMutex.Unlock()
 		}
 
-		go oq.sendEvent(ev)
+		go oq.sendEvent(&ev)
 	}
 
 	return nil
@@ -92,7 +92,7 @@ func (oqs *OutgoingQueues) SendEvent(
 
 // SendEvent sends an event to the destinations
 func (oqs *OutgoingQueues) SendInvite(
-	inviteReq *gomatrixserverlib.InviteV2Request,
+	inviteReq gomatrixserverlib.InviteV2Request,
 ) error {
 	ev := inviteReq.Event()
 	stateKey := ev.StateKey()
@@ -131,7 +131,7 @@ func (oqs *OutgoingQueues) SendInvite(
 		oqs.queuesMutex.Unlock()
 	}
 
-	go oq.sendInvite(inviteReq)
+	go oq.sendInvite(&inviteReq)
 
 	return nil
 }