diff --git a/packages/frontend/core/src/components/explorer/docs-view/docs-list.tsx b/packages/frontend/core/src/components/explorer/docs-view/docs-list.tsx
index a09f6161d4..9e7a65b130 100644
--- a/packages/frontend/core/src/components/explorer/docs-view/docs-list.tsx
+++ b/packages/frontend/core/src/components/explorer/docs-view/docs-list.tsx
@@ -101,6 +101,7 @@ export const DocsExplorer = ({
   const contextValue = useContext(DocExplorerContext);
   const docsService = useService(DocsService);
 
+  const groupBy = useLiveData(contextValue.groupBy$);
   const groups = useLiveData(contextValue.groups$);
   const view = useLiveData(contextValue.view$);
   const selectMode = useLiveData(contextValue.selectMode$);
@@ -113,8 +114,8 @@ export const DocsExplorer = ({
     const items = groups.map((group: any) => {
       return {
         id: group.key,
-        Component: groups.length > 1 ? GroupHeader : undefined,
-        height: groups.length > 1 ? 24 : 0,
+        Component: groupBy ? GroupHeader : undefined,
+        height: groupBy ? 24 : 0,
         className: styles.groupHeader,
         items: group.items.map((docId: string) => {
           return {
@@ -133,7 +134,7 @@ export const DocsExplorer = ({
       } satisfies MasonryGroup;
     });
     return items;
-  }, [groups, view]);
+  }, [groupBy, groups, view]);
 
   const handleCloseFloatingToolbar = useCallback(() => {
     contextValue.selectMode$?.next(false);
diff --git a/packages/frontend/core/src/modules/cloud/services/doc-created-by-updated-by-sync.ts b/packages/frontend/core/src/modules/cloud/services/doc-created-by-updated-by-sync.ts
index 302008eeed..9ccc8c4edd 100644
--- a/packages/frontend/core/src/modules/cloud/services/doc-created-by-updated-by-sync.ts
+++ b/packages/frontend/core/src/modules/cloud/services/doc-created-by-updated-by-sync.ts
@@ -136,7 +136,8 @@ export class DocCreatedByUpdatedBySyncService extends Service {
           workspaceRootDocSynced &&
           isOwnerOrAdmin &&
           missingCreatedBy &&
-          !markedSynced
+          !markedSynced &&
+          this.workspaceService.workspace.flavour !== 'local'
       )
     ),
     false