diff --git a/federationapi/queue/queue_test.go b/federationapi/queue/queue_test.go
index 687cbea65..df63262bf 100644
--- a/federationapi/queue/queue_test.go
+++ b/federationapi/queue/queue_test.go
@@ -301,6 +301,10 @@ func (d *fakeDatabase) IsServerBlacklisted(serverName gomatrixserverlib.ServerNa
 	return isBlacklisted, nil
 }
 
+func (d *fakeDatabase) GetMailserversForServer(serverName gomatrixserverlib.ServerName) ([]gomatrixserverlib.ServerName, error) {
+	return []gomatrixserverlib.ServerName{}, nil
+}
+
 type stubFederationRoomServerAPI struct {
 	rsapi.FederationRoomserverAPI
 }
diff --git a/federationapi/statistics/statistics.go b/federationapi/statistics/statistics.go
index 1bf956f18..6d9f88f0f 100644
--- a/federationapi/statistics/statistics.go
+++ b/federationapi/statistics/statistics.go
@@ -77,6 +77,13 @@ func (s *Statistics) ForServer(serverName gomatrixserverlib.ServerName) *ServerS
 		} else {
 			server.blacklisted.Store(blacklisted)
 		}
+
+		knownMailservers, err := s.DB.GetMailserversForServer(serverName)
+		if err != nil {
+			logrus.WithError(err).Errorf("Failed to get mailserver list for %q", serverName)
+		} else {
+			server.knownMailservers = knownMailservers
+		}
 	}
 	return server
 }