diff --git a/federationsender/queue/destinationqueue.go b/federationsender/queue/destinationqueue.go
index de4d487ee..82cb343f3 100644
--- a/federationsender/queue/destinationqueue.go
+++ b/federationsender/queue/destinationqueue.go
@@ -353,7 +353,6 @@ func (oq *destinationQueue) nextTransaction(
 	// If we didn't get anything from the database and there are no
 	// pending EDUs then there's nothing to do - stop here.
 	if len(pdus) == 0 && len(pendingEDUs) == 0 {
-		log.Warnf("Expected PDUs/EDUs for destination %q but got none", oq.destination)
 		return false, nil
 	}
 
diff --git a/federationsender/queue/queue.go b/federationsender/queue/queue.go
index 0858d813f..2288689ee 100644
--- a/federationsender/queue/queue.go
+++ b/federationsender/queue/queue.go
@@ -136,7 +136,7 @@ func (oqs *OutgoingQueues) SendEvent(
 	}
 
 	for _, destination := range destinations {
-		go oqs.getQueue(destination).sendEvent(nid)
+		oqs.getQueue(destination).sendEvent(nid)
 	}
 
 	return nil