diff --git a/src/Api/Startup.cs b/src/Api/Startup.cs
index d1ab843574..4b681c05ec 100644
--- a/src/Api/Startup.cs
+++ b/src/Api/Startup.cs
@@ -80,6 +80,7 @@ namespace Bit.Api
             services.AddSingleton<IOrganizationUserRepository, SqlServerRepos.OrganizationUserRepository>();
             services.AddSingleton<ISubvaultRepository, SqlServerRepos.SubvaultRepository>();
             services.AddSingleton<ISubvaultUserRepository, SqlServerRepos.SubvaultUserRepository>();
+            services.AddSingleton<IFolderRepository, SqlServerRepos.FolderRepository>();
 
             // Context
             services.AddScoped<CurrentContext>();
diff --git a/src/Sql/dbo/Stored Procedures/Cipher_Create.sql b/src/Sql/dbo/Stored Procedures/Cipher_Create.sql
index dc3fe7693b..03956191be 100644
--- a/src/Sql/dbo/Stored Procedures/Cipher_Create.sql	
+++ b/src/Sql/dbo/Stored Procedures/Cipher_Create.sql	
@@ -5,7 +5,10 @@
     @Type TINYINT,
     @Data NVARCHAR(MAX),
     @CreationDate DATETIME2(7),
-    @RevisionDate DATETIME2(7)
+    @RevisionDate DATETIME2(7),
+    -- Extra, unused props from cipher details model since dapper maps all child properties too. This is kind of a hack.
+    @FolderId UNIQUEIDENTIFIER,
+    @Favorite BIT
 AS
 BEGIN
     SET NOCOUNT ON
diff --git a/src/Sql/dbo/Stored Procedures/Cipher_Update.sql b/src/Sql/dbo/Stored Procedures/Cipher_Update.sql
index 8c05b46a3d..ad3a3d0fba 100644
--- a/src/Sql/dbo/Stored Procedures/Cipher_Update.sql	
+++ b/src/Sql/dbo/Stored Procedures/Cipher_Update.sql	
@@ -5,7 +5,10 @@
     @Type TINYINT,
     @Data NVARCHAR(MAX),
     @CreationDate DATETIME2(7),
-    @RevisionDate DATETIME2(7)
+    @RevisionDate DATETIME2(7),
+    -- Extra, unused props from cipher details model since dapper maps all child properties too. This is kind of a hack.
+    @FolderId UNIQUEIDENTIFIER,
+    @Favorite BIT
 AS
 BEGIN
     SET NOCOUNT ON