diff --git a/public/components/datasources/components/manage/accelerations/create_accelerations_flyout/create/create_acceleration.tsx b/public/components/datasources/components/manage/accelerations/create_accelerations_flyout/create/create_acceleration.tsx
index cd327d655..2f5895dba 100644
--- a/public/components/datasources/components/manage/accelerations/create_accelerations_flyout/create/create_acceleration.tsx
+++ b/public/components/datasources/components/manage/accelerations/create_accelerations_flyout/create/create_acceleration.tsx
@@ -117,9 +117,20 @@ export const CreateAcceleration = ({
   };
 
   const initiateColumnLoad = (dataSource: string, database: string, dataTable: string) => {
+    // All components related to table fields
     setAccelerationFormData({
       ...accelerationFormData,
       dataTableFields: [],
+      skippingIndexQueryData: [],
+      coveringIndexQueryData: [],
+      materializedViewQueryData: {
+        columnsValues: [],
+        groupByTumbleValue: {
+          timeField: '',
+          tumbleWindow: 0,
+          tumbleInterval: ACCELERATION_TIME_INTERVAL[2].value, // minutes
+        },
+      },
     });
     stopLoadingTableFields();
     if (dataTable !== '') {
@@ -163,6 +174,12 @@ export const CreateAcceleration = ({
     }
   }, [loadStatus]);
 
+  useEffect(() => {
+    return () => {
+      stopLoadingTableFields();
+    };
+  }, []);
+
   const dataSourcesPreselected = databaseName !== undefined && tableName !== undefined;
 
   return (
@@ -191,7 +208,6 @@ export const CreateAcceleration = ({
               accelerationFormData={accelerationFormData}
               setAccelerationFormData={setAccelerationFormData}
               initiateColumnLoad={initiateColumnLoad}
-              loading={tableFieldsLoading}
             />
             <EuiSpacer size="xxl" />
             <IndexSettingOptions
@@ -202,6 +218,7 @@ export const CreateAcceleration = ({
             <QueryVisualEditor
               accelerationFormData={accelerationFormData}
               setAccelerationFormData={setAccelerationFormData}
+              tableFieldsLoading={tableFieldsLoading}
             />
             <EuiSpacer size="xxl" />
             <IndexAdvancedSettings
diff --git a/public/components/datasources/components/manage/accelerations/create_accelerations_flyout/selectors/__tests__/__snapshots__/index_type_selector.test.tsx.snap b/public/components/datasources/components/manage/accelerations/create_accelerations_flyout/selectors/__tests__/__snapshots__/index_type_selector.test.tsx.snap
index 7eed70299..86c904d9b 100644
--- a/public/components/datasources/components/manage/accelerations/create_accelerations_flyout/selectors/__tests__/__snapshots__/index_type_selector.test.tsx.snap
+++ b/public/components/datasources/components/manage/accelerations/create_accelerations_flyout/selectors/__tests__/__snapshots__/index_type_selector.test.tsx.snap
@@ -244,7 +244,7 @@ Array [
                     aria-describedby="random_html_id-help-0"
                     aria-haspopup="true"
                     aria-labelledby="random_html_id random_html_id"
-                    className="euiSuperSelectControl euiSuperSelectControl-isLoading"
+                    className="euiSuperSelectControl"
                     onBlur={[Function]}
                     onClick={[Function]}
                     onFocus={[Function]}
@@ -256,9 +256,6 @@ Array [
                   <div
                     className="euiFormControlLayoutIcons euiFormControlLayoutIcons--right"
                   >
-                    <span
-                      className="euiLoadingSpinner euiLoadingSpinner--medium"
-                    />
                     <span
                       className="euiFormControlLayoutCustomIcon"
                     >
diff --git a/public/components/datasources/components/manage/accelerations/create_accelerations_flyout/selectors/index_type_selector.tsx b/public/components/datasources/components/manage/accelerations/create_accelerations_flyout/selectors/index_type_selector.tsx
index d2bdb8e3c..64fb19e57 100644
--- a/public/components/datasources/components/manage/accelerations/create_accelerations_flyout/selectors/index_type_selector.tsx
+++ b/public/components/datasources/components/manage/accelerations/create_accelerations_flyout/selectors/index_type_selector.tsx
@@ -18,14 +18,12 @@ interface IndexTypeSelectorProps {
   accelerationFormData: CreateAccelerationForm;
   setAccelerationFormData: React.Dispatch<React.SetStateAction<CreateAccelerationForm>>;
   initiateColumnLoad: (dataSource: string, database: string, dataTable: string) => void;
-  loading: boolean;
 }
 
 export const IndexTypeSelector = ({
   accelerationFormData,
   setAccelerationFormData,
   initiateColumnLoad,
-  loading,
 }: IndexTypeSelectorProps) => {
   const [value, setValue] = useState('skipping');
 
@@ -116,7 +114,6 @@ export const IndexTypeSelector = ({
           onChange={onChangeSupeSelect}
           itemLayoutAlign="top"
           hasDividers
-          isLoading={loading}
         />
       </EuiFormRow>
     </>
diff --git a/public/components/datasources/components/manage/accelerations/create_accelerations_flyout/selectors/selector_helpers/load_databases.tsx b/public/components/datasources/components/manage/accelerations/create_accelerations_flyout/selectors/selector_helpers/load_databases.tsx
index 635cf6976..43798d715 100644
--- a/public/components/datasources/components/manage/accelerations/create_accelerations_flyout/selectors/selector_helpers/load_databases.tsx
+++ b/public/components/datasources/components/manage/accelerations/create_accelerations_flyout/selectors/selector_helpers/load_databases.tsx
@@ -37,7 +37,7 @@ export const SelectorLoadDatabases = ({
   const {
     loadStatus: loadDatabasesStatus,
     startLoading: startDatabasesLoading,
-    stopLoading: _stopDatabasesLoading,
+    stopLoading: stopDatabasesLoading,
   } = useLoadDatabasesToCache();
 
   const onClickRefreshDatabases = () => {
@@ -62,6 +62,12 @@ export const SelectorLoadDatabases = ({
     setLoadingComboBoxes({ ...loadingComboBoxes, database: isLoading });
   }, [isLoading]);
 
+  useEffect(() => {
+    return () => {
+      stopDatabasesLoading();
+    };
+  }, []);
+
   return (
     <>
       {isLoading ? (
diff --git a/public/components/datasources/components/manage/accelerations/create_accelerations_flyout/selectors/selector_helpers/load_objects.tsx b/public/components/datasources/components/manage/accelerations/create_accelerations_flyout/selectors/selector_helpers/load_objects.tsx
index d687ef6ed..9366af2bc 100644
--- a/public/components/datasources/components/manage/accelerations/create_accelerations_flyout/selectors/selector_helpers/load_objects.tsx
+++ b/public/components/datasources/components/manage/accelerations/create_accelerations_flyout/selectors/selector_helpers/load_objects.tsx
@@ -48,12 +48,12 @@ export const SelectorLoadObjects = ({
   const {
     loadStatus: loadTablesStatus,
     startLoading: startLoadingTables,
-    stopLoading: _stopLoadingTables,
+    stopLoading: stopLoadingTables,
   } = useLoadTablesToCache();
   const {
     loadStatus: loadAccelerationsStatus,
     startLoading: startLoadingAccelerations,
-    stopLoading: _stopLoadingAccelerations,
+    stopLoading: stopLoadingAccelerations,
   } = useLoadAccelerationsToCache();
 
   const onClickRefreshDatabases = () => {
@@ -97,6 +97,12 @@ export const SelectorLoadObjects = ({
     setLoadingComboBoxes({ ...loadingComboBoxes, dataTable: isEitherLoading });
   }, [isEitherLoading]);
 
+  useEffect(() => {
+    return () => {
+      stopLoadingTables();
+      stopLoadingAccelerations();
+    };
+  }, []);
   return (
     <>
       {isEitherLoading ? (
diff --git a/public/components/datasources/components/manage/accelerations/create_accelerations_flyout/visual_editors/query_visual_editor.tsx b/public/components/datasources/components/manage/accelerations/create_accelerations_flyout/visual_editors/query_visual_editor.tsx
index 6ce594ccf..5089afc2e 100644
--- a/public/components/datasources/components/manage/accelerations/create_accelerations_flyout/visual_editors/query_visual_editor.tsx
+++ b/public/components/datasources/components/manage/accelerations/create_accelerations_flyout/visual_editors/query_visual_editor.tsx
@@ -3,7 +3,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import { EuiSpacer } from '@elastic/eui';
+import { EuiFlexGroup, EuiFlexItem, EuiLoadingSpinner, EuiSpacer } from '@elastic/eui';
 import React from 'react';
 import { CreateAccelerationForm } from '../../../../../../../../common/types/data_connections';
 import { CoveringIndexBuilder } from './covering_index/covering_index_builder';
@@ -13,13 +13,25 @@ import { SkippingIndexBuilder } from './skipping_index/skipping_index_builder';
 interface QueryVisualEditorProps {
   accelerationFormData: CreateAccelerationForm;
   setAccelerationFormData: React.Dispatch<React.SetStateAction<CreateAccelerationForm>>;
+  tableFieldsLoading: boolean;
 }
 
 export const QueryVisualEditor = ({
   accelerationFormData,
   setAccelerationFormData,
+  tableFieldsLoading,
 }: QueryVisualEditorProps) => {
-  return (
+  return tableFieldsLoading ? (
+    <>
+      <EuiFlexGroup alignItems="center" gutterSize="s" direction="column">
+        <EuiSpacer />
+        <EuiFlexItem>
+          <EuiLoadingSpinner size="l" />
+        </EuiFlexItem>
+        <EuiFlexItem grow={false}>Loading tables fields</EuiFlexItem>
+      </EuiFlexGroup>
+    </>
+  ) : (
     <>
       <EuiSpacer size="l" />
       {accelerationFormData.accelerationIndexType === 'skipping' && (