diff --git a/Composer/packages/client/src/App.tsx b/Composer/packages/client/src/App.tsx
index 16adf915ae..7cf04c8a88 100644
--- a/Composer/packages/client/src/App.tsx
+++ b/Composer/packages/client/src/App.tsx
@@ -13,7 +13,7 @@ import { resolveToBasePath } from './utils/fileUtil';
 import { CreationFlow } from './CreationFlow';
 import { ErrorBoundary } from './components/ErrorBoundary';
 import { RequireAuth } from './components/RequireAuth';
-
+import { CreationFlowStatus } from './constants';
 initializeIcons(undefined, { disableWarnings: true });
 
 // eslint-disable-next-line react/display-name
@@ -166,7 +166,9 @@ export const App: React.FC = () => {
         <div css={rightPanel}>
           <ErrorBoundary>
             <RequireAuth>
-              <CreationFlow creationFlowStatus={creationFlowStatus} setCreationFlowStatus={setCreationFlowStatus} />
+              {creationFlowStatus !== CreationFlowStatus.CLOSE && (
+                <CreationFlow creationFlowStatus={creationFlowStatus} setCreationFlowStatus={setCreationFlowStatus} />
+              )}
               <Routes component={Content} />
             </RequireAuth>
           </ErrorBoundary>
diff --git a/Composer/packages/client/src/CreationFlow/LocationBrowser/LocationSelectContent.js b/Composer/packages/client/src/CreationFlow/LocationBrowser/LocationSelectContent.js
index 10c07617da..c3da776f97 100644
--- a/Composer/packages/client/src/CreationFlow/LocationBrowser/LocationSelectContent.js
+++ b/Composer/packages/client/src/CreationFlow/LocationBrowser/LocationSelectContent.js
@@ -21,7 +21,13 @@ export function LocationSelectContent(props) {
 
   useEffect(() => {
     const index = currentStorageIndex.current;
-    updateCurrentPath(storages[index].path, storages[index].id);
+    let path = '';
+    let id = '';
+    if (storages[index]) {
+      path = storages[index].path;
+      id = storages[index].id;
+    }
+    updateCurrentPath(path, id);
   }, [storages]);
 
   useEffect(() => {