diff --git a/src/common/useModelState.js b/src/common/useModelState.js
index 36d2f9a51..c552e7455 100644
--- a/src/common/useModelState.js
+++ b/src/common/useModelState.js
@@ -36,7 +36,7 @@ function wrapPromise(promise) {
     };
 }
 
-const withGetInitState = (Component) => {
+const withGetInitState = (Component, Fallback = () => { }) => {
     return function WithGetInitState(props) {
         const { core } = useServices();
         const initStateRef = React.useRef({});
@@ -48,7 +48,7 @@ const withGetInitState = (Component) => {
             return initStateRef.current[model].read();
         }, []);
         return (
-            <React.Suspense>
+            <React.Suspense fallback={<Fallback {...props} />}>
                 <GetInitStateContext.Provider value={getInitState}>
                     <Component {...props} />
                 </GetInitStateContext.Provider>