diff --git a/packages/services/api/src/modules/schema/providers/models/composite-legacy.ts b/packages/services/api/src/modules/schema/providers/models/composite-legacy.ts
index de469fb5e..b4573c714 100644
--- a/packages/services/api/src/modules/schema/providers/models/composite-legacy.ts
+++ b/packages/services/api/src/modules/schema/providers/models/composite-legacy.ts
@@ -184,8 +184,8 @@ export class CompositeLegacyModel {
       commit: input.commit,
       target: target.id,
       date: Date.now() as any,
-      service_name: input.service!,
-      service_url: input.url!,
+      service_name: input.service || '',
+      service_url: input.url || '',
       action: 'PUSH',
       metadata: input.metadata ?? null,
     };
@@ -327,8 +327,8 @@ export class CompositeLegacyModel {
     if (shouldBePublished) {
       const messages: string[] = [];
 
-      if (hasNewUrl) {
-        messages.push(serviceUrlCheck.result.message!);
+      if (serviceUrlCheck.status === 'completed' && serviceUrlCheck.result.status === 'modified') {
+        messages.push(serviceUrlCheck.result.message);
       }
 
       if (hasNewMetadata) {
diff --git a/packages/services/api/src/modules/schema/providers/models/composite.ts b/packages/services/api/src/modules/schema/providers/models/composite.ts
index 5d997cd75..7be08ff19 100644
--- a/packages/services/api/src/modules/schema/providers/models/composite.ts
+++ b/packages/services/api/src/modules/schema/providers/models/composite.ts
@@ -308,8 +308,8 @@ export class CompositeModel {
       commit: input.commit,
       target: target.id,
       date: Date.now() as any,
-      service_name: input.service!,
-      service_url: input.url!,
+      service_name: input.service || '',
+      service_url: input.url || '',
       action: 'PUSH',
       metadata: input.metadata ?? null,
     };
@@ -456,18 +456,13 @@ export class CompositeModel {
       conditionalBreakingChangeDiffConfig,
     });
 
-    const hasNewUrl =
-      serviceUrlCheck.status === 'completed' && serviceUrlCheck.result.status === 'modified';
-    const hasNewMetadata =
-      metadataCheck?.status === 'completed' && metadataCheck.result.status === 'modified';
-
     const messages: string[] = [];
 
-    if (hasNewUrl) {
-      messages.push(serviceUrlCheck.result.message!);
+    if (serviceUrlCheck.status === 'completed' && serviceUrlCheck.result.status === 'modified') {
+      messages.push(serviceUrlCheck.result.message);
     }
 
-    if (hasNewMetadata) {
+    if (metadataCheck?.status === 'completed' && metadataCheck.result.status === 'modified') {
       messages.push('Metadata has been updated');
     }