diff --git a/src/components/Dashboard/DashboardBoot.js b/src/components/Dashboard/DashboardBoot.js
index 095a972cc..6e3d967fb 100644
--- a/src/components/Dashboard/DashboardBoot.js
+++ b/src/components/Dashboard/DashboardBoot.js
@@ -16,8 +16,9 @@ export function useDashboardMetaBoot() {
data: dashboardMeta,
isLoading: isDashboardMetaLoading,
isSuccess: isDashboardMetaSuccess,
- } = useDashboardMeta();
-
+ } = useDashboardMeta({
+ keepPreviousData: true,
+ });
const [startLoading, stopLoading] = useSplashLoading();
useWatchImmediate((value) => {
diff --git a/src/components/Dashboard/DashboardProvider.js b/src/components/Dashboard/DashboardProvider.js
index b72160cf4..68c8e5654 100644
--- a/src/components/Dashboard/DashboardProvider.js
+++ b/src/components/Dashboard/DashboardProvider.js
@@ -8,9 +8,9 @@ import { useDashboardBoot } from './DashboardBoot';
export default function DashboardProvider({ children }) {
const { isLoading } = useDashboardBoot();
- return (
-
- {isLoading ? null : children}
-
- );
+ // Avoid display any dashboard component before complete booting.
+ if (isLoading) {
+ return null;
+ }
+ return {children};
}