diff --git a/src/Sql/dbo/Tables/Cipher.sql b/src/Sql/dbo/Tables/Cipher.sql
index 93743579f5..c260c1b4cd 100644
--- a/src/Sql/dbo/Tables/Cipher.sql
+++ b/src/Sql/dbo/Tables/Cipher.sql
@@ -21,6 +21,7 @@ CREATE NONCLUSTERED INDEX [IX_Cipher_OrganizationId_Type]
 
 
 GO
-CREATE NONCLUSTERED INDEX [IX_Cipher_UserId_Type]
-    ON [dbo].[Cipher]([UserId] ASC, [Type] ASC);
+CREATE NONCLUSTERED INDEX [IX_Cipher_UserId_Type_IncludeAll]
+    ON [dbo].[Cipher]([UserId] ASC, [Type] ASC)
+    INCLUDE ([OrganizationId], [Data], [Favorites], [Folders], [Attachments], [CreationDate], [RevisionDate]);
 
diff --git a/src/Sql/dbo/Tables/Folder.sql b/src/Sql/dbo/Tables/Folder.sql
index c937987a16..caea6c0c2e 100644
--- a/src/Sql/dbo/Tables/Folder.sql
+++ b/src/Sql/dbo/Tables/Folder.sql
@@ -8,3 +8,9 @@
     CONSTRAINT [FK_Folder_User] FOREIGN KEY ([UserId]) REFERENCES [dbo].[User] ([Id])
 );
 
+
+GO
+CREATE NONCLUSTERED INDEX [IX_Folder_UserId_IncludeAll]
+    ON [dbo].[Folder]([UserId] ASC)
+    INCLUDE ([Name], [CreationDate], [RevisionDate]);
+