diff --git a/frontend/src/metabase-lib/lib/queries/NativeQuery.ts b/frontend/src/metabase-lib/lib/queries/NativeQuery.ts
index ad6119c98236b81b713c8fa5fc5184249012bb5d..77e8018bc5117c1d99a1663dea0e3a54837c07ff 100644
--- a/frontend/src/metabase-lib/lib/queries/NativeQuery.ts
+++ b/frontend/src/metabase-lib/lib/queries/NativeQuery.ts
@@ -286,18 +286,10 @@ export default class NativeQuery extends AtomicQuery {
   }
 
   allTemplateTagsAreValid() {
-    return this.templateTags().every(t => {
-      if (["text", "number", "date", "card", "snippet"].includes(t.type)) {
-        return true;
-      }
-
-      const isDimensionType = t.type === "dimension";
-      const hasDefinedWidgetType =
-        t["widget-type"] && t["widget-type"] !== "none";
-      const hasDefinedDimension = t.dimension != null;
-
-      return isDimensionType && hasDefinedWidgetType && hasDefinedDimension;
-    });
+    return this.templateTags().every(
+      // field filters require a field
+      t => !(t.type === "dimension" && t.dimension == null),
+    );
   }
 
   setTemplateTag(name, tag) {
diff --git a/frontend/test/metabase-lib/lib/queries/NativeQuery.unit.spec.js b/frontend/test/metabase-lib/lib/queries/NativeQuery.unit.spec.js
index 7818d89fbcb2fc24ba3dafa956fbce3122c785c1..827e1d21db96edc86ee44ed211beb59968d8cbe7 100644
--- a/frontend/test/metabase-lib/lib/queries/NativeQuery.unit.spec.js
+++ b/frontend/test/metabase-lib/lib/queries/NativeQuery.unit.spec.js
@@ -193,49 +193,6 @@ describe("NativeQuery", () => {
         expect(q.canRun()).toBe(true);
       });
 
-      it("bad type", () => {
-        q = q.setDatasetQuery(
-          assocIn(
-            q.datasetQuery(),
-            ["native", "template-tags", "foo", "type"],
-            "type-that-does-not-exist",
-          ),
-        );
-        expect(q.canRun()).toBe(false);
-
-        q = q.setDatasetQuery(
-          assocIn(
-            q.datasetQuery(),
-            ["native", "template-tags", "foo", "type"],
-            "text",
-          ),
-        );
-        expect(q.canRun()).toBe(true);
-      });
-
-      it("dimension type without a widget-type", () => {
-        q = q.setDatasetQuery(
-          assocIn(q.datasetQuery(), ["native", "template-tags", "foo"], {
-            type: "dimension",
-            dimension: ["field", 123, null],
-          }),
-        );
-
-        expect(q.canRun()).toBe(false);
-      });
-
-      it("dimension type with a widget-type of none", () => {
-        q = q.setDatasetQuery(
-          assocIn(q.datasetQuery(), ["native", "template-tags", "foo"], {
-            type: "dimension",
-            "widget-type": "none",
-            dimension: ["field", 123, null],
-          }),
-        );
-
-        expect(q.canRun()).toBe(false);
-      });
-
       it("dimension type without a dimension", () => {
         q = q.setDatasetQuery(
           assocIn(q.datasetQuery(), ["native", "template-tags", "foo"], {
diff --git a/frontend/test/metabase/scenarios/native-filters/sql-field-filter-none.cy.spec.js b/frontend/test/metabase/scenarios/native-filters/sql-field-filter-none.cy.spec.js
index d481543afe468f30c5ad996ba36386ed1c03d368..f0f65322f09058d79ac249bb8cf3dbc986d4292d 100644
--- a/frontend/test/metabase/scenarios/native-filters/sql-field-filter-none.cy.spec.js
+++ b/frontend/test/metabase/scenarios/native-filters/sql-field-filter-none.cy.spec.js
@@ -30,9 +30,13 @@ describe("scenarios > filters > sql filters > field filter > None", () => {
     filterWidget().should("not.exist");
   });
 
-  it("should disallow the running of the query and the saving of the question", () => {
-    cy.get(".RunButton").should("be.disabled");
-    cy.findByText("Save").should("have.attr", "aria-disabled", "true");
+  it("should be runnable with the None filter being ignored (metabase#20643)", () => {
+    cy.get(".RunButton")
+      .first()
+      .click();
+
+    cy.wait("@dataset");
+    cy.findByText("Hudson Borer");
   });
 
   it("should let you change the field filter type to something else and restore the filter widget (metabase#13825)", () => {