diff --git a/pkg/plugins/datasource_plugin.go b/pkg/plugins/datasource_plugin.go
index ff44805e35f..04b77a892c5 100644
--- a/pkg/plugins/datasource_plugin.go
+++ b/pkg/plugins/datasource_plugin.go
@@ -24,6 +24,7 @@ type DataSourcePlugin struct {
 	Metrics      bool              `json:"metrics"`
 	Alerting     bool              `json:"alerting"`
 	Explore      bool              `json:"explore"`
+	Table        bool              `json:"tables"`
 	Logs         bool              `json:"logs"`
 	QueryOptions map[string]bool   `json:"queryOptions,omitempty"`
 	BuiltIn      bool              `json:"builtIn,omitempty"`
diff --git a/public/app/features/explore/Explore.tsx b/public/app/features/explore/Explore.tsx
index 70d9beba9b8..e0eca13db54 100644
--- a/public/app/features/explore/Explore.tsx
+++ b/public/app/features/explore/Explore.tsx
@@ -176,7 +176,7 @@ export class Explore extends React.PureComponent<ExploreProps, ExploreState> {
   async setDatasource(datasource: any, origin?: DataSource) {
     const supportsGraph = datasource.meta.metrics;
     const supportsLogs = datasource.meta.logs;
-    const supportsTable = datasource.meta.metrics;
+    const supportsTable = datasource.meta.tables;
     const datasourceId = datasource.meta.id;
     let datasourceError = null;
 
diff --git a/public/app/types/plugins.ts b/public/app/types/plugins.ts
index 5c1875e57c8..c8fc490908a 100644
--- a/public/app/types/plugins.ts
+++ b/public/app/types/plugins.ts
@@ -41,6 +41,7 @@ export interface PluginMeta {
 
   // Datasource-specific
   metrics?: boolean;
+  tables?: boolean;
   logs?: boolean;
   explore?: boolean;
   annotations?: boolean;