diff --git a/src/Microsoft.FeatureManagement/FeatureManagementBuilder.cs b/src/Microsoft.FeatureManagement/FeatureManagementBuilder.cs
index 1d1e699b..2b2af56c 100644
--- a/src/Microsoft.FeatureManagement/FeatureManagementBuilder.cs
+++ b/src/Microsoft.FeatureManagement/FeatureManagementBuilder.cs
@@ -5,6 +5,7 @@
 using System.Collections.Generic;
 using System.Linq;
 using Microsoft.Extensions.DependencyInjection;
+using Microsoft.FeatureManagement.FeatureFilters;
 
 namespace Microsoft.FeatureManagement
 {
@@ -26,6 +27,13 @@ public IFeatureManagementBuilder AddFeatureFilter<T>() where T : IFeatureFilterM
 
             Type implementationType = typeof(T);
 
+            //
+            // TimeWindowFilter will only be added through another overload of AddFeatureFilter 
+            if (implementationType == typeof(TimeWindowFilter))
+            {
+                return this;
+            }
+
             IEnumerable<Type> featureFilterImplementations = implementationType.GetInterfaces()
                 .Where(i => i == typeof(IFeatureFilter) || 
                             (i.IsGenericType && i.GetGenericTypeDefinition().IsAssignableFrom(typeof(IContextualFeatureFilter<>))));