diff --git a/apps/meteor/app/cloud/server/functions/getWorkspaceLicense.ts b/apps/meteor/app/cloud/server/functions/getWorkspaceLicense.ts
index 2ab8a4b27a622..f9f0cfadc6697 100644
--- a/apps/meteor/app/cloud/server/functions/getWorkspaceLicense.ts
+++ b/apps/meteor/app/cloud/server/functions/getWorkspaceLicense.ts
@@ -73,7 +73,7 @@ export async function getWorkspaceLicense(): Promise<{ updated: boolean; license
 
 		const payload = await fetchCloudWorkspaceLicensePayload({ token });
 
-		if (Date.parse(payload.updatedAt) <= currentLicense._updatedAt.getTime()) {
+		if (currentLicense.value && Date.parse(payload.updatedAt) <= currentLicense._updatedAt.getTime()) {
 			return fromCurrentLicense();
 		}
 
diff --git a/apps/meteor/app/cloud/server/functions/syncWorkspace/announcementSync.ts b/apps/meteor/app/cloud/server/functions/syncWorkspace/announcementSync.ts
index 26d98b4a75747..f3885c1e95c2b 100644
--- a/apps/meteor/app/cloud/server/functions/syncWorkspace/announcementSync.ts
+++ b/apps/meteor/app/cloud/server/functions/syncWorkspace/announcementSync.ts
@@ -107,7 +107,7 @@ export async function announcementSync() {
 	} catch (err) {
 		SystemLogger.error({
 			msg: 'Failed to sync with Rocket.Chat Cloud',
-			url: '/sync',
+			url: '/comms/workspace',
 			err,
 		});
 	}
diff --git a/apps/meteor/app/cloud/server/functions/syncWorkspace/index.ts b/apps/meteor/app/cloud/server/functions/syncWorkspace/index.ts
index 3173e652afe57..bdd898b510f7f 100644
--- a/apps/meteor/app/cloud/server/functions/syncWorkspace/index.ts
+++ b/apps/meteor/app/cloud/server/functions/syncWorkspace/index.ts
@@ -1,3 +1,4 @@
+import { SystemLogger } from '../../../../../server/lib/logger/system';
 import { CloudWorkspaceAccessTokenError } from '../getWorkspaceAccessToken';
 import { getCachedSupportedVersionsToken } from '../supportedVersionsToken/supportedVersionsToken';
 import { announcementSync } from './announcementSync';
@@ -7,10 +8,11 @@ export async function syncWorkspace() {
 	try {
 		await syncCloudData();
 		await announcementSync();
-	} catch (error) {
-		if (error instanceof CloudWorkspaceAccessTokenError) {
+	} catch (err) {
+		if (err instanceof CloudWorkspaceAccessTokenError) {
 			// TODO: Remove License if there is no access token
 		}
+		SystemLogger.error({ msg: 'Error during workspace sync', err });
 	}
 
 	await getCachedSupportedVersionsToken.reset();
diff --git a/apps/meteor/ee/app/license/server/startup.ts b/apps/meteor/ee/app/license/server/startup.ts
index 765a4205a1a77..8cce4d3d14106 100644
--- a/apps/meteor/ee/app/license/server/startup.ts
+++ b/apps/meteor/ee/app/license/server/startup.ts
@@ -93,7 +93,6 @@ settings.onReady(async () => {
 	License.onBehaviorTriggered('start_fair_policy', async (context) => syncByTrigger(`start_fair_policy_${context.limit}`));
 
 	License.onBehaviorTriggered('disable_modules', async (context) => syncByTrigger(`disable_modules_${context.limit}`));
-
 });
 
 License.setLicenseLimitCounter('activeUsers', () => Users.getActiveLocalUserCount());