diff --git a/src/Infrastructure.Dapper/Repositories/CollectionRepository.cs b/src/Infrastructure.Dapper/Repositories/CollectionRepository.cs
index d95fe15974..d2e15670e2 100644
--- a/src/Infrastructure.Dapper/Repositories/CollectionRepository.cs
+++ b/src/Infrastructure.Dapper/Repositories/CollectionRepository.cs
@@ -367,12 +367,15 @@ public class CollectionRepository : Repository<Collection, Guid>, ICollectionRep
     {
         using (var connection = new SqlConnection(ConnectionString))
         {
+            var collectionId = CoreHelpers.GenerateComb();
+            var now = DateTime.UtcNow;
             var parameters = new DynamicParameters();
+            parameters.Add("@CollectionId", collectionId);
             parameters.Add("@OrganizationId", organizationId);
             parameters.Add("@OrganizationUserId", organizationUserId);
             parameters.Add("@Name", defaultCollectionName);
-            parameters.Add("@CreationDate", DateTime.UtcNow);
-            parameters.Add("@RevisionDate", DateTime.UtcNow);
+            parameters.Add("@CreationDate", now);
+            parameters.Add("@RevisionDate", now);
             parameters.Add("@WasCreated", dbType: DbType.Boolean, direction: ParameterDirection.Output);
 
             await connection.ExecuteAsync(
diff --git a/src/Infrastructure.EntityFramework/Repositories/CollectionRepository.cs b/src/Infrastructure.EntityFramework/Repositories/CollectionRepository.cs
index 29444bfff8..73afc048e4 100644
--- a/src/Infrastructure.EntityFramework/Repositories/CollectionRepository.cs
+++ b/src/Infrastructure.EntityFramework/Repositories/CollectionRepository.cs
@@ -828,11 +828,11 @@ public class CollectionRepository : Repository<Core.Entities.Collection, Collect
 
         // Check if this organization user already has a default collection
         var existingDefaultCollection = await (
-            from ou in dbContext.OrganizationUsers
-            where ou.Id == organizationUserId && ou.OrganizationId == organizationId
-            join cu in dbContext.CollectionUsers on ou.Id equals cu.OrganizationUserId
-            join c in dbContext.Collections on cu.CollectionId equals c.Id
-            where c.Type == CollectionType.DefaultUserCollection
+            from c in dbContext.Collections
+            join cu in dbContext.CollectionUsers on c.Id equals cu.CollectionId
+            where cu.OrganizationUserId == organizationUserId
+                && c.OrganizationId == organizationId
+                && c.Type == CollectionType.DefaultUserCollection
             select c
         ).FirstOrDefaultAsync();
 
diff --git a/src/Sql/dbo/Stored Procedures/Collection_UpsertDefaultCollection.sql b/src/Sql/dbo/Stored Procedures/Collection_UpsertDefaultCollection.sql
index 189f67f85a..d7e78734dc 100644
--- a/src/Sql/dbo/Stored Procedures/Collection_UpsertDefaultCollection.sql	
+++ b/src/Sql/dbo/Stored Procedures/Collection_UpsertDefaultCollection.sql	
@@ -1,4 +1,8 @@
+-- This procedure prevents duplicate "My Items" collections for users by checking
+-- if a default collection already exists before attempting to create one.
+
 CREATE PROCEDURE [dbo].[Collection_UpsertDefaultCollection]
+    @CollectionId UNIQUEIDENTIFIER,
     @OrganizationId UNIQUEIDENTIFIER,
     @OrganizationUserId UNIQUEIDENTIFIER,
     @Name VARCHAR(MAX),
@@ -9,70 +13,69 @@ AS
 BEGIN
     SET NOCOUNT ON
 
-    DECLARE @CollectionId UNIQUEIDENTIFIER;
+    DECLARE @ExistingCollectionId UNIQUEIDENTIFIER;
 
     -- Check if this organization user already has a default collection
-    SELECT @CollectionId = c.Id
+    SELECT @ExistingCollectionId = c.Id
     FROM [dbo].[Collection] c
     INNER JOIN [dbo].[CollectionUser] cu ON cu.CollectionId = c.Id
     WHERE cu.OrganizationUserId = @OrganizationUserId
         AND c.OrganizationId = @OrganizationId
         AND c.Type = 1; -- CollectionType.DefaultUserCollection
 
-    -- If no default collection exists, create one
-    IF @CollectionId IS NULL
-    BEGIN
-        SET @CollectionId = NEWID();
-        SET @WasCreated = 1;
-
-        -- Insert Collection
-        INSERT INTO [dbo].[Collection]
-        (
-            [Id],
-            [OrganizationId],
-            [Name],
-            [ExternalId],
-            [CreationDate],
-            [RevisionDate],
-            [DefaultUserCollectionEmail],
-            [Type]
-        )
-        VALUES
-        (
-            @CollectionId,
-            @OrganizationId,
-            @Name,
-            NULL, -- ExternalId
-            @CreationDate,
-            @RevisionDate,
-            NULL, -- DefaultUserCollectionEmail
-            1 -- CollectionType.DefaultUserCollection
-        );
-
-        -- Insert CollectionUser
-        INSERT INTO [dbo].[CollectionUser]
-        (
-            [CollectionId],
-            [OrganizationUserId],
-            [ReadOnly],
-            [HidePasswords],
-            [Manage]
-        )
-        VALUES
-        (
-            @CollectionId,
-            @OrganizationUserId,
-            0, -- ReadOnly = false
-            0, -- HidePasswords = false
-            1  -- Manage = true
-        );
-
-        -- Bump user account revision dates
-        EXEC [dbo].[User_BumpAccountRevisionDateByCollectionId] @CollectionId, @OrganizationId;
-    END
-    ELSE
+    -- If collection already exists, return early
+    IF @ExistingCollectionId IS NOT NULL
     BEGIN
         SET @WasCreated = 0;
+        RETURN;
     END
+
+    -- Create new default collection
+    SET @WasCreated = 1;
+
+    -- Insert Collection
+    INSERT INTO [dbo].[Collection]
+    (
+        [Id],
+        [OrganizationId],
+        [Name],
+        [ExternalId],
+        [CreationDate],
+        [RevisionDate],
+        [DefaultUserCollectionEmail],
+        [Type]
+    )
+    VALUES
+    (
+        @CollectionId,
+        @OrganizationId,
+        @Name,
+        NULL, -- ExternalId
+        @CreationDate,
+        @RevisionDate,
+        NULL, -- DefaultUserCollectionEmail
+        1 -- CollectionType.DefaultUserCollection
+    );
+
+    -- Insert CollectionUser
+    INSERT INTO [dbo].[CollectionUser]
+    (
+        [CollectionId],
+        [OrganizationUserId],
+        [ReadOnly],
+        [HidePasswords],
+        [Manage]
+    )
+    VALUES
+    (
+        @CollectionId,
+        @OrganizationUserId,
+        0, -- ReadOnly = false
+        0, -- HidePasswords = false
+        1  -- Manage = true
+    );
+
+    -- Bump user account revision dates
+    EXEC [dbo].[User_BumpAccountRevisionDateByCollectionId] @CollectionId, @OrganizationId;
 END
 GO
diff --git a/util/Migrator/DbScripts/2025-12-02_00_Collection_UpsertDefaultCollection.sql b/util/Migrator/DbScripts/2025-12-02_00_Collection_UpsertDefaultCollection.sql
index cbf1c68394..e5a69554db 100644
--- a/util/Migrator/DbScripts/2025-12-02_00_Collection_UpsertDefaultCollection.sql
+++ b/util/Migrator/DbScripts/2025-12-02_00_Collection_UpsertDefaultCollection.sql
@@ -3,6 +3,7 @@
 -- if a default collection already exists before attempting to create one.
 
 CREATE PROCEDURE [dbo].[Collection_UpsertDefaultCollection]
+    @CollectionId UNIQUEIDENTIFIER,
     @OrganizationId UNIQUEIDENTIFIER,
     @OrganizationUserId UNIQUEIDENTIFIER,
     @Name VARCHAR(MAX),
@@ -13,70 +14,69 @@ AS
 BEGIN
     SET NOCOUNT ON
 
-    DECLARE @CollectionId UNIQUEIDENTIFIER;
+    DECLARE @ExistingCollectionId UNIQUEIDENTIFIER;
 
     -- Check if this organization user already has a default collection
-    SELECT @CollectionId = c.Id
+    SELECT @ExistingCollectionId = c.Id
     FROM [dbo].[Collection] c
     INNER JOIN [dbo].[CollectionUser] cu ON cu.CollectionId = c.Id
     WHERE cu.OrganizationUserId = @OrganizationUserId
         AND c.OrganizationId = @OrganizationId
         AND c.Type = 1; -- CollectionType.DefaultUserCollection
 
-    -- If no default collection exists, create one
-    IF @CollectionId IS NULL
-    BEGIN
-        SET @CollectionId = NEWID();
-        SET @WasCreated = 1;
-
-        -- Insert Collection
-        INSERT INTO [dbo].[Collection]
-        (
-            [Id],
-            [OrganizationId],
-            [Name],
-            [ExternalId],
-            [CreationDate],
-            [RevisionDate],
-            [DefaultUserCollectionEmail],
-            [Type]
-        )
-        VALUES
-        (
-            @CollectionId,
-            @OrganizationId,
-            @Name,
-            NULL, -- ExternalId
-            @CreationDate,
-            @RevisionDate,
-            NULL, -- DefaultUserCollectionEmail
-            1 -- CollectionType.DefaultUserCollection
-        );
-
-        -- Insert CollectionUser
-        INSERT INTO [dbo].[CollectionUser]
-        (
-            [CollectionId],
-            [OrganizationUserId],
-            [ReadOnly],
-            [HidePasswords],
-            [Manage]
-        )
-        VALUES
-        (
-            @CollectionId,
-            @OrganizationUserId,
-            0, -- ReadOnly = false
-            0, -- HidePasswords = false
-            1  -- Manage = true
-        );
-
-        -- Bump user account revision dates
-        EXEC [dbo].[User_BumpAccountRevisionDateByCollectionId] @CollectionId, @OrganizationId;
-    END
-    ELSE
+    -- If collection already exists, return early
+    IF @ExistingCollectionId IS NOT NULL
     BEGIN
         SET @WasCreated = 0;
+        RETURN;
     END
+
+    -- Create new default collection
+    SET @WasCreated = 1;
+
+    -- Insert Collection
+    INSERT INTO [dbo].[Collection]
+    (
+        [Id],
+        [OrganizationId],
+        [Name],
+        [ExternalId],
+        [CreationDate],
+        [RevisionDate],
+        [DefaultUserCollectionEmail],
+        [Type]
+    )
+    VALUES
+    (
+        @CollectionId,
+        @OrganizationId,
+        @Name,
+        NULL, -- ExternalId
+        @CreationDate,
+        @RevisionDate,
+        NULL, -- DefaultUserCollectionEmail
+        1 -- CollectionType.DefaultUserCollection
+    );
+
+    -- Insert CollectionUser
+    INSERT INTO [dbo].[CollectionUser]
+    (
+        [CollectionId],
+        [OrganizationUserId],
+        [ReadOnly],
+        [HidePasswords],
+        [Manage]
+    )
+    VALUES
+    (
+        @CollectionId,
+        @OrganizationUserId,
+        0, -- ReadOnly = false
+        0, -- HidePasswords = false
+        1  -- Manage = true
+    );
+
+    -- Bump user account revision dates
+    EXEC [dbo].[User_BumpAccountRevisionDateByCollectionId] @CollectionId, @OrganizationId;
 END
 GO