diff --git a/src/Sql/dbo/Tables/Collection.sql b/src/Sql/dbo/Tables/Collection.sql
index 01057c093d..02f011a023 100644
--- a/src/Sql/dbo/Tables/Collection.sql
+++ b/src/Sql/dbo/Tables/Collection.sql
@@ -7,4 +7,10 @@
     CONSTRAINT [PK_Collection] PRIMARY KEY CLUSTERED ([Id] ASC),
     CONSTRAINT [FK_Collection_Organization] FOREIGN KEY ([OrganizationId]) REFERENCES [dbo].[Organization] ([Id]) ON DELETE CASCADE
 );
+GO
+
+CREATE NONCLUSTERED INDEX [IX_Collection_OrganizationId_IncludeAll]
+    ON [dbo].[Collection]([OrganizationId] ASC)
+    INCLUDE([CreationDate], [Name], [RevisionDate]);
+GO
 
diff --git a/util/Setup/DbScripts/2018-04-24_00_CipherQueryTuning.sql b/util/Setup/DbScripts/2018-04-24_00_CipherQueryTuning.sql
index 4c725f08d3..81d4d2c03f 100644
--- a/util/Setup/DbScripts/2018-04-24_00_CipherQueryTuning.sql
+++ b/util/Setup/DbScripts/2018-04-24_00_CipherQueryTuning.sql
@@ -155,6 +155,17 @@ BEGIN
 END
 GO
 
+IF NOT EXISTS (
+    SELECT * FROM sys.indexes  WHERE [Name]='IX_Collection_OrganizationId_IncludeAll'
+    AND object_id = OBJECT_ID('[dbo].[Collection]')
+)
+BEGIN
+    CREATE NONCLUSTERED INDEX [IX_Collection_OrganizationId_IncludeAll]
+        ON [dbo].[Collection]([OrganizationId] ASC)
+        INCLUDE([CreationDate], [Name], [RevisionDate])
+END
+GO
+
 IF OBJECT_ID('[dbo].[CipherDetails_ReadByTypeUserId]') IS NOT NULL
 BEGIN
     DROP PROCEDURE [dbo].[CipherDetails_ReadByTypeUserId]