diff --git a/superset/assets/src/explore/controls.jsx b/superset/assets/src/explore/controls.jsx
index 0bb268065..8dbba958f 100644
--- a/superset/assets/src/explore/controls.jsx
+++ b/superset/assets/src/explore/controls.jsx
@@ -772,6 +772,7 @@ export const controls = {
       ['PT30S', '30 seconds'],
       ['PT1M', '1 minute'],
       ['PT5M', '5 minutes'],
+      ['PT30M', '30 minutes'],
       ['PT1H', '1 hour'],
       ['PT6H', '6 hour'],
       ['P1D', '1 day'],
diff --git a/superset/connectors/druid/models.py b/superset/connectors/druid/models.py
index 4ff5e5fa0..1b71707bb 100644
--- a/superset/connectors/druid/models.py
+++ b/superset/connectors/druid/models.py
@@ -529,8 +529,8 @@ class DruidDatasource(Model, BaseDatasource):
     def time_column_grains(self):
         return {
             'time_columns': [
-                'all', '5 seconds', '30 seconds', '1 minute',
-                '5 minutes', '1 hour', '6 hour', '1 day', '7 days',
+                'all', '5 seconds', '30 seconds', '1 minute', '5 minutes'
+                '30 minutes', '1 hour', '6 hour', '1 day', '7 days',
                 'week', 'week_starting_sunday', 'week_ending_saturday',
                 'month',
             ],
@@ -762,6 +762,7 @@ class DruidDatasource(Model, BaseDatasource):
             '30 seconds': 'PT30S',
             '1 minute': 'PT1M',
             '5 minutes': 'PT5M',
+            '30 minutes': 'PT30M',
             '1 hour': 'PT1H',
             '6 hour': 'PT6H',
             'one day': 'P1D',