diff --git a/superset-frontend/packages/superset-ui-core/src/query/types/Query.ts b/superset-frontend/packages/superset-ui-core/src/query/types/Query.ts
index c16ea7b0fb2a7..cb90fe6f6c393 100644
--- a/superset-frontend/packages/superset-ui-core/src/query/types/Query.ts
+++ b/superset-frontend/packages/superset-ui-core/src/query/types/Query.ts
@@ -324,7 +324,7 @@ export type Query = {
   executedSql: string;
   output: string | Record<string, any>;
   actions: Record<string, any>;
-  type: DatasourceType.Query;
+  type: DatasourceType;
   columns: QueryColumn[];
 };
 
@@ -355,7 +355,7 @@ export const testQuery: Query = {
   isDataPreview: false,
   progress: 0,
   resultsKey: null,
-  state: 'success',
+  state: QueryState.SUCCESS,
   tempSchema: null,
   trackingUrl: null,
   templateParams: null,
diff --git a/superset-frontend/src/SqlLab/fixtures.ts b/superset-frontend/src/SqlLab/fixtures.ts
index 835b6652eea56..58b21edd9cf73 100644
--- a/superset-frontend/src/SqlLab/fixtures.ts
+++ b/superset-frontend/src/SqlLab/fixtures.ts
@@ -19,7 +19,7 @@
 import sinon from 'sinon';
 import * as actions from 'src/SqlLab/actions/sqlLab';
 import { ColumnKeyTypeType } from 'src/SqlLab/components/ColumnElement';
-import { Query, QueryState } from '@superset-ui/core';
+import { DatasourceType, QueryResponse, QueryState } from '@superset-ui/core';
 
 export const mockedActions = sinon.stub({ ...actions });
 
@@ -190,6 +190,7 @@ export const defaultQueryEditor = {
     },
   ],
 };
+
 export const queries = [
   {
     dbId: 1,
@@ -345,6 +346,7 @@ export const queryWithNoQueryLimit = {
     },
   },
 };
+
 export const queryWithBadColumns = {
   ...queries[0],
   results: {
@@ -408,6 +410,7 @@ export const queryWithBadColumns = {
     ],
   },
 };
+
 export const databases = {
   result: [
     {
@@ -430,6 +433,7 @@ export const databases = {
     },
   ],
 };
+
 export const tables = {
   options: [
     {
@@ -513,7 +517,7 @@ export const failedQueryWithErrors = {
   tempTable: '',
 };
 
-const baseQuery: Query = {
+const baseQuery: QueryResponse = {
   queryId: 567,
   dbId: 1,
   sql: 'SELECT * FROM superset.slices',
@@ -550,6 +554,8 @@ const baseQuery: Query = {
   extra: {
     progress: null,
   },
+  columns: [],
+  type: DatasourceType.Query,
   results: {
     displayLimitReached: false,
     query: { limit: 6 },
@@ -591,7 +597,7 @@ const baseQuery: Query = {
   },
 };
 
-export const runningQuery: Query = {
+export const runningQuery: QueryResponse = {
   ...baseQuery,
   dbId: 1,
   cached: false,
@@ -602,7 +608,7 @@ export const runningQuery: Query = {
   startDttm: Date.now() - 500,
 };
 
-export const successfulQuery: Query = {
+export const successfulQuery: QueryResponse = {
   ...baseQuery,
   dbId: 1,
   cached: false,
diff --git a/superset-frontend/src/SqlLab/types.ts b/superset-frontend/src/SqlLab/types.ts
index 7b59dfe95f85f..84406b62253e7 100644
--- a/superset-frontend/src/SqlLab/types.ts
+++ b/superset-frontend/src/SqlLab/types.ts
@@ -27,7 +27,7 @@ export type ExploreDatasource = Dataset | QueryResponse;
 
 // Object as Dictionary (associative array) with Query id as the key and type Query as the value
 export type QueryDictionary = {
-  [id: string]: Query;
+  [id: string]: QueryResponse;
 };
 
 export interface QueryEditor {