diff --git a/src/Explorer/Panes/Tables/AddTableEntityPanel.tsx b/src/Explorer/Panes/Tables/AddTableEntityPanel.tsx
index 63b9526d4..069d7a88d 100644
--- a/src/Explorer/Panes/Tables/AddTableEntityPanel.tsx
+++ b/src/Explorer/Panes/Tables/AddTableEntityPanel.tsx
@@ -29,7 +29,7 @@ import {
   getDefaultEntities,
   getEntityValuePlaceholder,
   imageProps,
-  options,
+  options
 } from "./Validators/EntityTableHelper";
 
 interface AddTableEntityPanelProps {
@@ -39,6 +39,7 @@ interface AddTableEntityPanelProps {
   tableEntityListViewModel: TableEntityListViewModel;
   cassandraApiClient: CassandraAPIDataClient;
   reloadEntities: () => void;
+  headerItem: string[];
 }
 
 interface EntityRowType {
@@ -59,6 +60,7 @@ export const AddTableEntityPanel: FunctionComponent<AddTableEntityPanelProps> =
   tableEntityListViewModel,
   cassandraApiClient,
   reloadEntities,
+  headerItem,
 }: AddTableEntityPanelProps): JSX.Element => {
   const closeSidePanel = useSidePanel((state) => state.closeSidePanel);
   const [entities, setEntities] = useState<EntityRowType[]>([]);
@@ -78,7 +80,7 @@ export const AddTableEntityPanel: FunctionComponent<AddTableEntityPanelProps> =
   }, []);
 
   const getDefaultEntitiesAttribute = async (): Promise<void> => {
-    let headers = tableEntityListViewModel.headers;
+    let headers = tableEntityListViewModel.headers?.length > 1 ? tableEntityListViewModel.headers : headerItem;
     if (DataTableUtilities.checkForDefaultHeader(headers)) {
       headers = [];
       if (userContext.apiType === "Tables") {
diff --git a/src/Explorer/Tabs/QueryTablesTab/QueryTablesTabComponent.tsx b/src/Explorer/Tabs/QueryTablesTab/QueryTablesTabComponent.tsx
index 287381b18..c6733713e 100644
--- a/src/Explorer/Tabs/QueryTablesTab/QueryTablesTabComponent.tsx
+++ b/src/Explorer/Tabs/QueryTablesTab/QueryTablesTabComponent.tsx
@@ -304,12 +304,12 @@ class QueryTablesTabComponent extends Component<IQueryTablesTabComponentProps, I
           true
         );
 
-        headers = this.getFormattedHeaders(documents.Results);
+        headers = documents.Results?.length ? this.getFormattedHeaders(documents.Results) : ["userid", "name", "email"];
         this.setupIntialEntities(documents.Results, headers, isInitialLoad);
       } else {
         const { collection } = this.props;
         documents = await this.getDocuments(collection, selectedQueryText);
-        headers = this.getFormattedHeaders(documents.Results);
+        headers = documents.Results?.length ? this.getFormattedHeaders(documents.Results) : ["RowKey", "PartitionKey", "Timestamp"];
         this.setupIntialEntities(documents.Results, headers, isInitialLoad);
       }
       this.setState({
@@ -473,6 +473,7 @@ class QueryTablesTabComponent extends Component<IQueryTablesTabComponentProps, I
       .openSidePanel(
         "Add Table Entity",
         <AddTableEntityPanel
+          headerItem={this.state.headers}
           tableDataClient={this.tableDataClient}
           queryTablesTab={this.props.queryTablesTab}
           tableEntityListViewModel={this.state.tableEntityListViewModel}