Fix #89623

src/vs/platform/userDataSync/common/abstractSynchronizer.ts

@@ -77,7 +77,10 @@ export abstract class AbstractSynchroniser extends Disposable {
 		await this.fileService.writeFile(this.lastSyncResource, VSBuffer.fromString(JSON.stringify(lastSyncUserData)));
 	}
 
-	protected getRemoteUserData(lastSyncData?: IUserData | null): Promise<IUserData> {
+	protected async getRemoteUserData(lastSyncData?: IUserData | null): Promise<IUserData> {
+		if (lastSyncData === undefined) {
+			lastSyncData = await this.getLastSyncUserData();
+		}
 		return this.userDataSyncStoreService.read(this.getRemoteDataResourceKey(), lastSyncData || null, this.source);
 	}
 

src/vs/platform/userDataSync/common/globalStateSync.ts

@@ -154,7 +154,7 @@ export class GlobalStateSynchroniser extends AbstractSynchroniser implements IUs
 		const lastSyncData = await this.getLastSyncUserData();
 		const lastSyncGlobalState = lastSyncData && lastSyncData.content ? JSON.parse(lastSyncData.content) : null;
 
-		const remoteUserData = await this.getRemoteUserData();
+		const remoteUserData = await this.getRemoteUserData(lastSyncData);
 		const remoteGlobalState: IGlobalState = remoteUserData.content ? JSON.parse(remoteUserData.content) : null;
 
 		const localGloablState = await this.getLocalGlobalState();