diff --git a/src/Sql/dbo/Vault/Stored Procedures/SecurityTask/SecurityTask_ReadByUserIdStatus.sql b/src/Sql/dbo/Vault/Stored Procedures/SecurityTask/SecurityTask_ReadByUserIdStatus.sql
index 3697a7367c..bd639e4d2f 100644
--- a/src/Sql/dbo/Vault/Stored Procedures/SecurityTask/SecurityTask_ReadByUserIdStatus.sql	
+++ b/src/Sql/dbo/Vault/Stored Procedures/SecurityTask/SecurityTask_ReadByUserIdStatus.sql	
@@ -62,7 +62,7 @@ BEGIN
         SELECT
             ST.*
         FROM
-            dbo.SecurityTask ST
+            dbo.[SecurityTaskView] ST
         WHERE
             @Status IS NULL
             OR ST.Status = @Status
diff --git a/util/Migrator/DbScripts/2025-06-13_00_ImproveSecurityTask.sql b/util/Migrator/DbScripts/2025-06-13_00_ImproveSecurityTask.sql
index 4491348e90..9f0122d1d9 100644
--- a/util/Migrator/DbScripts/2025-06-13_00_ImproveSecurityTask.sql
+++ b/util/Migrator/DbScripts/2025-06-13_00_ImproveSecurityTask.sql
@@ -89,17 +89,41 @@ BEGIN
 END
 GO
 
-CREATE NONCLUSTERED INDEX IX_CollectionGroup_GroupId_ReadOnly
-  ON dbo.CollectionGroup (GroupId, ReadOnly)
-  INCLUDE (CollectionId);
+IF NOT EXISTS (
+    SELECT 1
+    FROM sys.indexes
+    WHERE object_id = OBJECT_ID('dbo.CollectionGroup')
+        AND name = 'IX_CollectionGroup_GroupId_ReadOnly'
+)
+BEGIN
+    CREATE NONCLUSTERED INDEX IX_CollectionGroup_GroupId_ReadOnly
+      ON dbo.CollectionGroup (GroupId, ReadOnly)
+      INCLUDE (CollectionId);
+END
 GO
 
-CREATE NONCLUSTERED INDEX IX_CollectionUser_OrganizationUserId_ReadOnly
-  ON dbo.CollectionUser (OrganizationUserId, ReadOnly)
-  INCLUDE (CollectionId);
+IF NOT EXISTS (
+    SELECT 1
+    FROM sys.indexes
+    WHERE object_id = OBJECT_ID('dbo.CollectionUser')
+        AND name = 'IX_CollectionUser_OrganizationUserId_ReadOnly'
+)
+BEGIN
+    CREATE NONCLUSTERED INDEX IX_CollectionUser_OrganizationUserId_ReadOnly
+      ON dbo.CollectionUser (OrganizationUserId, ReadOnly)
+      INCLUDE (CollectionId);
+END
 GO
 
-CREATE NONCLUSTERED INDEX IX_SecurityTask_Status_OrgId_CreationDateDesc
-  ON dbo.SecurityTask (Status, OrganizationId, CreationDate DESC)
-  INCLUDE (CipherId, [Type], RevisionDate);
+IF NOT EXISTS (
+    SELECT 1
+    FROM sys.indexes
+    WHERE object_id = OBJECT_ID('dbo.SecurityTask')
+        AND name = 'IX_SecurityTask_Status_OrgId_CreationDateDesc'
+)
+BEGIN
+    CREATE NONCLUSTERED INDEX IX_SecurityTask_Status_OrgId_CreationDateDesc
+      ON dbo.SecurityTask (Status, OrganizationId, CreationDate DESC)
+      INCLUDE (CipherId, [Type], RevisionDate);
+END
 GO