diff --git a/docs/content/querying/filters.md b/docs/content/querying/filters.md
index d5e30caa8ac..d158b893d36 100644
--- a/docs/content/querying/filters.md
+++ b/docs/content/querying/filters.md
@@ -487,3 +487,11 @@ Filtering on a set of ISO 8601 intervals:
     ]
 }
 ```
+
+
+### Noop Filter
+The noop filter is a filter which applies no conditions to your query.  Useful if you need to disable other filters when queries are generated programatically. 
+
+```json
+{ "type" : "noop" }
+```
\ No newline at end of file
diff --git a/processing/src/main/java/io/druid/query/filter/DimFilter.java b/processing/src/main/java/io/druid/query/filter/DimFilter.java
index e925a2cf731..28259c13f79 100644
--- a/processing/src/main/java/io/druid/query/filter/DimFilter.java
+++ b/processing/src/main/java/io/druid/query/filter/DimFilter.java
@@ -42,7 +42,8 @@ import io.druid.java.util.common.Cacheable;
     @JsonSubTypes.Type(name = "bound", value = BoundDimFilter.class),
     @JsonSubTypes.Type(name = "interval", value = IntervalDimFilter.class),
     @JsonSubTypes.Type(name = "like", value = LikeDimFilter.class),
-    @JsonSubTypes.Type(name = "expression", value = ExpressionDimFilter.class)
+    @JsonSubTypes.Type(name = "expression", value = ExpressionDimFilter.class),
+    @JsonSubTypes.Type(name = "noop", value = NoopDimFilter.class)
 })
 public interface DimFilter extends Cacheable
 {