diff --git a/src/Umbraco.Infrastructure/Persistence/Repositories/Implement/KeyValueRepository.cs b/src/Umbraco.Infrastructure/Persistence/Repositories/Implement/KeyValueRepository.cs
index 2b318b2056..3c2da4d5b7 100644
--- a/src/Umbraco.Infrastructure/Persistence/Repositories/Implement/KeyValueRepository.cs
+++ b/src/Umbraco.Infrastructure/Persistence/Repositories/Implement/KeyValueRepository.cs
@@ -18,6 +18,18 @@ namespace Umbraco.Core.Persistence.Repositories.Implement
             : base(scopeAccessor, AppCaches.NoCache, logger)
         { }
 
+        #region Overrides of IReadWriteQueryRepository<string, IKeyValue>
+
+        public override void Save(IKeyValue entity)
+        {
+            if (Get(entity.Identifier) == null)
+                PersistNewItem(entity);
+            else
+                PersistUpdatedItem(entity);
+        }
+
+        #endregion
+
         #region Overrides of NPocoRepositoryBase<string, IKeyValue>
 
         protected override Guid NodeObjectTypeId => throw new NotSupportedException();
diff --git a/src/Umbraco.Infrastructure/Persistence/Repositories/Implement/RepositoryBaseOfTIdTEntity.cs b/src/Umbraco.Infrastructure/Persistence/Repositories/Implement/RepositoryBaseOfTIdTEntity.cs
index e8397ba22a..6985bf78da 100644
--- a/src/Umbraco.Infrastructure/Persistence/Repositories/Implement/RepositoryBaseOfTIdTEntity.cs
+++ b/src/Umbraco.Infrastructure/Persistence/Repositories/Implement/RepositoryBaseOfTIdTEntity.cs
@@ -132,7 +132,7 @@ namespace Umbraco.Core.Persistence.Repositories.Implement
         /// </summary>
         /// <remarks>This method is backed by an <see cref="IAppPolicyCache"/> cache</remarks>
         /// <param name="entity"></param>
-        public void Save(TEntity entity)
+        public virtual void Save(TEntity entity)
         {
             if (entity.HasIdentity == false)
                 CachePolicy.Create(entity, PersistNewItem);