diff --git a/common/basecomponent/base.go b/common/basecomponent/base.go
index 364e07c81..dc917ffe2 100644
--- a/common/basecomponent/base.go
+++ b/common/basecomponent/base.go
@@ -15,11 +15,12 @@
 package basecomponent
 
 import (
-	"crypto/ed25519"
 	"database/sql"
 	"io"
 	"net/http"
 
+	"golang.org/x/crypto/ed25519"
+
 	"github.com/matrix-org/dendrite/common/keydb"
 	"github.com/matrix-org/gomatrixserverlib"
 	"github.com/matrix-org/naffka"
diff --git a/common/keydb/keydb.go b/common/keydb/keydb.go
index 2e7d97c7f..d1f2b7ebc 100644
--- a/common/keydb/keydb.go
+++ b/common/keydb/keydb.go
@@ -16,9 +16,10 @@ package keydb
 
 import (
 	"context"
-	"crypto/ed25519"
 	"net/url"
 
+	"golang.org/x/crypto/ed25519"
+
 	"github.com/matrix-org/dendrite/common/keydb/postgres"
 	"github.com/matrix-org/gomatrixserverlib"
 )
diff --git a/common/keydb/postgres/keydb.go b/common/keydb/postgres/keydb.go
index f0accd36e..2dd8c866f 100644
--- a/common/keydb/postgres/keydb.go
+++ b/common/keydb/postgres/keydb.go
@@ -17,10 +17,11 @@ package postgres
 
 import (
 	"context"
-	"crypto/ed25519"
 	"database/sql"
 	"math"
 
+	"golang.org/x/crypto/ed25519"
+
 	"github.com/matrix-org/gomatrixserverlib"
 )