diff --git a/frontend/src/AppLoader/AppLoader.jsx b/frontend/src/AppLoader/AppLoader.jsx
index da9fa2eae1..a130a36ecf 100644
--- a/frontend/src/AppLoader/AppLoader.jsx
+++ b/frontend/src/AppLoader/AppLoader.jsx
@@ -1,14 +1,13 @@
 import React, { useEffect } from 'react';
 import { withTranslation } from 'react-i18next';
 import { appService, organizationService, authenticationService } from '@/_services';
-import { Editor } from '../Editor/Editor';
+import { Editor, EditorFunc } from '@/Editor';
 import { RealtimeEditor } from '@/Editor/RealtimeEditor';
 import config from 'config';
 import { safelyParseJSON, stripTrailingSlash, redirectToDashboard, getSubpath, getWorkspaceId } from '@/_helpers/utils';
 import { toast } from 'react-hot-toast';
 import { useParams } from 'react-router-dom';
 import { useAppDataActions } from '@/_stores/appDataStore';
-import Spinner from '@/_ui/Spinner';
 import _ from 'lodash';
 
 const AppLoaderComponent = (props) => {
@@ -78,12 +77,12 @@ const AppLoaderComponent = (props) => {
     }
   };
 
-  if (!shouldLoadApp) return <Spinner />;
+  if (!shouldLoadApp) return <></>;
 
   return config.ENABLE_MULTIPLAYER_EDITING ? (
     <RealtimeEditor {...props} shouldLoadApp={shouldLoadApp} />
   ) : (
-    <Editor {...props} shouldLoadApp={shouldLoadApp} />
+    <EditorFunc {...props} shouldLoadApp={shouldLoadApp} />
   );
 };
 
diff --git a/frontend/src/Editor/Header/index.js b/frontend/src/Editor/Header/index.js
index fe3b17ef0d..e19a3a6503 100644
--- a/frontend/src/Editor/Header/index.js
+++ b/frontend/src/Editor/Header/index.js
@@ -65,7 +65,8 @@ export default function EditorHeader({
     updatePresence(initialPresence);
     // eslint-disable-next-line react-hooks/exhaustive-deps
   }, [currentUser]);
-  const handleLogoClick = () => {
+  const handleLogoClick = (e) => {
+    e.preventDefault();
     // Force a reload for clearing interval triggers
     window.location.href = '/';
   };