diff --git a/superset/db_engine_specs/presto.py b/superset/db_engine_specs/presto.py
index c060da56f46..6e28bd1e12a 100644
--- a/superset/db_engine_specs/presto.py
+++ b/superset/db_engine_specs/presto.py
@@ -53,8 +53,8 @@ pandas_dtype_map = {
     "real": "float64",
     "double": "float64",
     "varchar": "object",
-    "timestamp": "datetime64",
-    "date": "datetime64",
+    "timestamp": "datetime64[ns]",
+    "date": "datetime64[ns]",
     "varbinary": "object",
 }
 
diff --git a/tests/dataframe_test.py b/tests/dataframe_test.py
index 6b421e919c5..d254d63a040 100644
--- a/tests/dataframe_test.py
+++ b/tests/dataframe_test.py
@@ -129,3 +129,9 @@ class SupersetDataFrameTestCase(SupersetTestCase):
             cdf.raw_df.values.tolist(),
             [[np.nan], [1239162456494753670], [np.nan], [np.nan], [np.nan], [np.nan]],
         )
+
+    def test_pandas_datetime64(self):
+        data = [(None,)]
+        cursor_descr = [("ds", "timestamp", None, None, None, None, True)]
+        cdf = SupersetDataFrame(data, cursor_descr, PrestoEngineSpec)
+        self.assertEqual(cdf.raw_df.dtypes[0], np.dtype("<M8[ns]"))