diff --git a/frontend/src/metabase/query_builder/components/filters/FilterOptions.jsx b/frontend/src/metabase/query_builder/components/filters/FilterOptions.jsx
index 96a4ba16a9317dac513a62eb0aa2ac2a84b1a840..da404da4b91f08db9fd333634db8a135dbf8079b 100644
--- a/frontend/src/metabase/query_builder/components/filters/FilterOptions.jsx
+++ b/frontend/src/metabase/query_builder/components/filters/FilterOptions.jsx
@@ -3,6 +3,7 @@ import React, { Component } from "react";
 import { t, jt } from 'c-3po';
 
 import CheckBox from "metabase/components/CheckBox";
+import MetabaseAnalytics from "metabase/lib/analytics";
 
 import { getOperator } from "./pickers/DatePicker.jsx";
 
@@ -50,15 +51,16 @@ export default class FilterOptions extends Component {
 
   toggleCurrentPeriod = () => {
     const { filter } = this.props;
-      const operator = getOperator(filter);
+    const operator = getOperator(filter);
 
-      if (operator && operator.options && operator.options["include-current"]) {
-          const options = getFilterOptions(filter);
-          this.props.onFilterChange(setFilterOptions(filter, {
-            ...options,
-            "include-current": !options["include-current"]
-          }));
-      }
+    if (operator && operator.options && operator.options["include-current"]) {
+        const options = getFilterOptions(filter);
+        this.props.onFilterChange(setFilterOptions(filter, {
+          ...options,
+          "include-current": !options["include-current"]
+        }));
+        MetabaseAnalytics.trackEvent("QueryBuilder", "Filter", "ToggleCurrentPeriod", !options["include-current"])
+    }
   }
 
   render() {
diff --git a/frontend/test/query_builder/components/filters/FilterPopover.unit.spec.js b/frontend/test/query_builder/components/filters/FilterPopover.unit.spec.js
index 89a8e8850547301470aaa96d2faa0b37ef9e37dc..b31d68c71dd59ba72a23a84ce7d2803c2ceb238d 100644
--- a/frontend/test/query_builder/components/filters/FilterPopover.unit.spec.js
+++ b/frontend/test/query_builder/components/filters/FilterPopover.unit.spec.js
@@ -1,3 +1,4 @@
+import "__support__/mocks"
 import React from 'react'
 import { shallow, mount } from 'enzyme'