diff --git a/superset/assets/src/dashboard/reducers/dashboardState.js b/superset/assets/src/dashboard/reducers/dashboardState.js
index 5312de2578..69d4e69c7e 100644
--- a/superset/assets/src/dashboard/reducers/dashboardState.js
+++ b/superset/assets/src/dashboard/reducers/dashboardState.js
@@ -97,8 +97,7 @@ export default function dashboardStateReducer(state = {}, action) {
       const { chart, col, vals: nextVals, merge, refresh } = action;
       const sliceId = chart.id;
       const filterKeys = [
-        '__from',
-        '__to',
+        '__time_range',
         '__time_col',
         '__time_grain',
         '__time_origin',
diff --git a/superset/assets/src/explore/components/controls/DateFilterControl.jsx b/superset/assets/src/explore/components/controls/DateFilterControl.jsx
index 40f249e8bf..f15e6f470c 100644
--- a/superset/assets/src/explore/components/controls/DateFilterControl.jsx
+++ b/superset/assets/src/explore/components/controls/DateFilterControl.jsx
@@ -176,7 +176,7 @@ export default class DateFilterControl extends React.Component {
   }
   handleClick(e) {
     // switch to `TYPES.CUSTOM_START_END` when the calendar is clicked
-    if (this.startEndSectionRef.contains(e.target)) {
+    if (this.startEndSectionRef && this.startEndSectionRef.contains(e.target)) {
       this.setState({ type: TYPES.CUSTOM_START_END });
     }
   }