diff --git a/panoramix/models.py b/panoramix/models.py
index 157721ce2..b12a2d7b0 100644
--- a/panoramix/models.py
+++ b/panoramix/models.py
@@ -919,7 +919,10 @@ class Datasource(Model, AuditMixinNullable, Queryable):
         if df is None or df.size == 0:
             raise Exception("No data was returned.")
 
-        if not is_timeseries and 'timestamp' in df.columns:
+        if (
+                not is_timeseries and
+                granularity == "all"
+                and 'timestamp' in df.columns):
             del df['timestamp']
 
         # Reordering columns
diff --git a/panoramix/viz.py b/panoramix/viz.py
index f5552d4ad..294e0e8bc 100644
--- a/panoramix/viz.py
+++ b/panoramix/viz.py
@@ -287,7 +287,7 @@ class TableViz(BaseViz):
         'lib/dataTables/dataTables.bootstrap.css',
         'widgets/viz_table.css',
     ]
-    is_timeseries = True
+    is_timeseries = False
     js_files = [
         'lib/d3.min.js',
         'lib/dataTables/jquery.dataTables.min.js',