diff --git a/cmd/dendrite-demo-libp2p/main.go b/cmd/dendrite-demo-libp2p/main.go
index a5dce2d3f..fa2adda94 100644
--- a/cmd/dendrite-demo-libp2p/main.go
+++ b/cmd/dendrite-demo-libp2p/main.go
@@ -49,7 +49,7 @@ import (
 
 func createKeyDB(
 	base *P2PDendrite,
-	db gomatrixserverlib.KeyDatabase,
+	db *gomatrixserverlib.KeyRing,
 ) {
 	mdns := mDNSListener{
 		host:  base.LibP2P,
@@ -168,11 +168,9 @@ func main() {
 		panic("failed to create new public rooms provider: " + err.Error())
 	}
 
-	/*
-		createKeyDB(
-			base, keyRing,
-		)
-	*/
+	createKeyDB(
+		base, keyRing,
+	)
 
 	monolith := setup.Monolith{
 		Config:    base.Base.Cfg,
diff --git a/cmd/dendrite-demo-libp2p/mdnslistener.go b/cmd/dendrite-demo-libp2p/mdnslistener.go
index c30aaa331..c6105e52c 100644
--- a/cmd/dendrite-demo-libp2p/mdnslistener.go
+++ b/cmd/dendrite-demo-libp2p/mdnslistener.go
@@ -25,7 +25,7 @@ import (
 )
 
 type mDNSListener struct {
-	keydb gomatrixserverlib.KeyDatabase
+	keydb *gomatrixserverlib.KeyRing
 	host  host.Host
 }
 
@@ -35,7 +35,7 @@ func (n *mDNSListener) HandlePeerFound(p peer.AddrInfo) {
 	}
 	if pubkey, err := p.ID.ExtractPublicKey(); err == nil {
 		raw, _ := pubkey.Raw()
-		if err := n.keydb.StoreKeys(
+		if err := n.keydb.KeyDatabase.StoreKeys(
 			context.Background(),
 			map[gomatrixserverlib.PublicKeyLookupRequest]gomatrixserverlib.PublicKeyLookupResult{
 				{
diff --git a/federationapi/storage/sqlite3/server_key_table.go b/federationapi/storage/sqlite3/server_key_table.go
index a7c5ab42f..9b89649f6 100644
--- a/federationapi/storage/sqlite3/server_key_table.go
+++ b/federationapi/storage/sqlite3/server_key_table.go
@@ -67,7 +67,9 @@ type serverSigningKeyStatements struct {
 }
 
 func NewSQLiteServerSigningKeysTable(db *sql.DB) (s *serverSigningKeyStatements, err error) {
-	s = &serverSigningKeyStatements{}
+	s = &serverSigningKeyStatements{
+		db: db,
+	}
 	_, err = db.Exec(serverSigningKeysSchema)
 	if err != nil {
 		return