diff --git a/src/Sql/dbo/KeyManagement/Tables/UserSignatureKeyPair.sql b/src/Sql/dbo/KeyManagement/Tables/UserSignatureKeyPair.sql
index 9ee71a853b..e3b8d13474 100644
--- a/src/Sql/dbo/KeyManagement/Tables/UserSignatureKeyPair.sql
+++ b/src/Sql/dbo/KeyManagement/Tables/UserSignatureKeyPair.sql
@@ -9,3 +9,8 @@
     CONSTRAINT [PK_UserSignatureKeyPair] PRIMARY KEY CLUSTERED ([Id] ASC),
     CONSTRAINT [FK_UserSignatureKeyPair_User] FOREIGN KEY ([UserId]) REFERENCES [dbo].[User] ([Id]),
 );
+GO
+
+CREATE NONCLUSTERED INDEX [IX_UserSignatureKeyPair_UserId]
+    ON [dbo].[UserSignatureKeyPair]([UserId] ASC);
+GO
\ No newline at end of file
diff --git a/util/Migrator/DbScripts/2025-06-01_00_AddSignatureKeyPairTable.sql b/util/Migrator/DbScripts/2025-06-01_00_AddSignatureKeyPairTable.sql
index c90eb42f58..5310aa1015 100644
--- a/util/Migrator/DbScripts/2025-06-01_00_AddSignatureKeyPairTable.sql
+++ b/util/Migrator/DbScripts/2025-06-01_00_AddSignatureKeyPairTable.sql
@@ -11,6 +11,16 @@ CREATE TABLE [dbo].[UserSignatureKeyPair] (
 );
 GO
 
+IF NOT EXISTS(SELECT name
+FROM sys.indexes
+WHERE name = 'IX_UserSignatureKeyPair_UserId')
+BEGIN
+CREATE NONCLUSTERED INDEX [IX_UserSignatureKeyPair_UserId]
+    ON [dbo].[UserSignatureKeyPair]([UserId] ASC);
+END
+GO
+
+
 CREATE OR ALTER VIEW [dbo].[UserSignatureKeyPairView]
 AS
 SELECT