diff --git a/superset/viz.py b/superset/viz.py
index 959b64f468eb6..66ddc4bfb58f2 100644
--- a/superset/viz.py
+++ b/superset/viz.py
@@ -42,7 +42,6 @@
 import numpy as np
 import pandas as pd
 from pandas.tseries.frequencies import to_offset
-from pandas.tseries.offsets import DateOffset
 import polyline
 import simplejson as json
 
@@ -1399,7 +1398,10 @@ def get_data(self, df):
         fd = self.form_data
         df = self.process_data(df)
         freq = to_offset(fd.get("freq"))
-        freq = DateOffset(normalize=True, **freq.kwds)
+        try:
+            freq = type(freq)(freq.n, normalize=True, **freq.kwds)
+        except ValueError:
+            freq = type(freq)(freq.n, **freq.kwds)
         df.index.name = None
         df[DTTM_ALIAS] = df.index.map(freq.rollback)
         df["ranked"] = df[DTTM_ALIAS].rank(method="dense", ascending=False) - 1