diff --git a/src/Sql/dbo/Tables/Transaction.sql b/src/Sql/dbo/Tables/Transaction.sql
index 0395bae353..3a0c35192a 100644
--- a/src/Sql/dbo/Tables/Transaction.sql
+++ b/src/Sql/dbo/Tables/Transaction.sql
@@ -19,7 +19,8 @@
 
 GO
 CREATE UNIQUE NONCLUSTERED INDEX [IX_Transaction_Gateway_GatewayId]
-    ON [dbo].[Transaction]([Gateway] ASC, [GatewayId] ASC);
+    ON [dbo].[Transaction]([Gateway] ASC, [GatewayId] ASC)
+    WHERE [Gateway] IS NOT NULL AND [GatewayId] IS NOT NULL;
 
 
 GO
diff --git a/util/Setup/DbScripts/2019-01-31_00_Transactions.sql b/util/Setup/DbScripts/2019-01-31_00_Transactions.sql
index d113d86194..274a1c5d46 100644
--- a/util/Setup/DbScripts/2019-01-31_00_Transactions.sql
+++ b/util/Setup/DbScripts/2019-01-31_00_Transactions.sql
@@ -19,8 +19,8 @@ BEGIN
     );
 
     CREATE UNIQUE NONCLUSTERED INDEX [IX_Transaction_Gateway_GatewayId]
-        ON [dbo].[Transaction]([Gateway] ASC, [GatewayId] ASC);
-
+        ON [dbo].[Transaction]([Gateway] ASC, [GatewayId] ASC)
+        WHERE [Gateway] IS NOT NULL AND [GatewayId] IS NOT NULL;
 
     CREATE NONCLUSTERED INDEX [IX_Transaction_UserId_OrganizationId_CreationDate]
         ON [dbo].[Transaction]([UserId] ASC, [OrganizationId] ASC, [CreationDate] ASC);