1 files changed, 8 insertions, 4 deletions
diff --git a/keyserver/keyserver.go b/keyserver/keyserver.go
index 36bedf34..79d9cec9 100644
--- a/keyserver/keyserver.go
+++ b/keyserver/keyserver.go
@@ -15,6 +15,8 @@
 package keyserver
 
 import (
+	"sync"
+
 	"github.com/Shopify/sarama"
 	"github.com/gorilla/mux"
 	"github.com/matrix-org/dendrite/internal/config"
@@ -51,9 +53,11 @@ func NewInternalAPI(
 		DB:       db,
 	}
 	return &internal.KeyInternalAPI{
-		DB:         db,
-		ThisServer: cfg.Matrix.ServerName,
-		FedClient:  fedClient,
-		Producer:   keyChangeProducer,
+		DB:            db,
+		ThisServer:    cfg.Matrix.ServerName,
+		FedClient:     fedClient,
+		Producer:      keyChangeProducer,
+		Mutex:         &sync.Mutex{},
+		UserIDToMutex: make(map[string]*sync.Mutex),
 	}
 }