diff --git a/keyserver/internal/cross_signing.go b/keyserver/internal/cross_signing.go
index 3e0bbf55c..08bbfedb8 100644
--- a/keyserver/internal/cross_signing.go
+++ b/keyserver/internal/cross_signing.go
@@ -380,13 +380,6 @@ func (a *KeyInternalAPI) processSelfSignatures(
 				}
 
 			case *gomatrixserverlib.DeviceKeys:
-				for keyID := range sig.Keys {
-					split := strings.SplitN(string(keyID), ":", 2)
-					if len(split) > 1 && gomatrixserverlib.KeyID(split[1]) == targetKeyID {
-						targetKeyID = keyID // contains the ed25519: or other scheme
-						break
-					}
-				}
 				for originUserID, forOriginUserID := range sig.Signatures {
 					for originKeyID, originSig := range forOriginUserID {
 						if err := a.DB.StoreCrossSigningSigsForTarget(