diff --git a/src/Umbraco.Core/Migrations/Install/DatabaseDataCreator.cs b/src/Umbraco.Core/Migrations/Install/DatabaseDataCreator.cs
index ba491fb5e1..cf00e79800 100644
--- a/src/Umbraco.Core/Migrations/Install/DatabaseDataCreator.cs
+++ b/src/Umbraco.Core/Migrations/Install/DatabaseDataCreator.cs
@@ -149,6 +149,7 @@ namespace Umbraco.Core.Migrations.Install
             _database.Insert(Constants.DatabaseSchema.Tables.Lock, "id", false, new LockDto { Id = Constants.Locks.MemberTypes, Name = "MemberTypes" });
             _database.Insert(Constants.DatabaseSchema.Tables.Lock, "id", false, new LockDto { Id = Constants.Locks.MemberTree, Name = "MemberTree" });
             _database.Insert(Constants.DatabaseSchema.Tables.Lock, "id", false, new LockDto { Id = Constants.Locks.Domains, Name = "Domains" });
+            _database.Insert(Constants.DatabaseSchema.Tables.Lock, "id", false, new LockDto { Id = Constants.Locks.KeyValues, Name = "KeyValues" });
             _database.Insert(Constants.DatabaseSchema.Tables.Lock, "id", false, new LockDto { Id = Constants.Locks.Languages, Name = "Languages" });
         }
 
diff --git a/src/Umbraco.Core/Persistence/Dtos/LockDto.cs b/src/Umbraco.Core/Persistence/Dtos/LockDto.cs
index 833d262e26..b5878141f3 100644
--- a/src/Umbraco.Core/Persistence/Dtos/LockDto.cs
+++ b/src/Umbraco.Core/Persistence/Dtos/LockDto.cs
@@ -4,12 +4,12 @@ using Umbraco.Core.Persistence.DatabaseAnnotations;
 namespace Umbraco.Core.Persistence.Dtos
 {
     [TableName(Constants.DatabaseSchema.Tables.Lock)]
-    [PrimaryKey("id")]
+    [PrimaryKey("id", AutoIncrement = false)]
     [ExplicitColumns]
     internal class LockDto
     {
         [Column("id")]
-        [PrimaryKeyColumn(Name = "PK_umbracoLock")]
+        [PrimaryKeyColumn(Name = "PK_umbracoLock", AutoIncrement = false)]
         public int Id { get; set; }
 
         [Column("value")]
diff --git a/src/Umbraco.Tests/Persistence/LocksTests.cs b/src/Umbraco.Tests/Persistence/LocksTests.cs
index 4dfb90c8fd..819dbc89ed 100644
--- a/src/Umbraco.Tests/Persistence/LocksTests.cs
+++ b/src/Umbraco.Tests/Persistence/LocksTests.cs
@@ -25,12 +25,9 @@ namespace Umbraco.Tests.Persistence
             using (var scope = ScopeProvider.CreateScope())
             {
                 var database = scope.Database;
-                database.Execute("SET IDENTITY_INSERT umbracoLock ON");
                 database.Insert("umbracoLock", "id", false, new LockDto { Id = 1, Name = "Lock.1" });
                 database.Insert("umbracoLock", "id", false, new LockDto { Id = 2, Name = "Lock.2" });
                 database.Insert("umbracoLock", "id", false, new LockDto { Id = 3, Name = "Lock.3" });
-                database.Execute("SET IDENTITY_INSERT umbracoLock OFF");
-                database.CompleteTransaction();
                 scope.Complete();
             }
         }