diff --git a/src/lib/addons/datadog.ts b/src/lib/addons/datadog.ts
index e72bdb660c..96f688106e 100644
--- a/src/lib/addons/datadog.ts
+++ b/src/lib/addons/datadog.ts
@@ -96,7 +96,7 @@ This was changed by ${createdBy}.`;
         )}\`\`\``;
         return `${createdBy} ${action} feature toggle ${feature}
 ${enabled}${stale} | ${typeStr} | ${project}
-${strategies}`;
+${data.strategies ? strategies : ''}`;
     }
 
     getAction(type: string): string {
diff --git a/src/lib/addons/slack.ts b/src/lib/addons/slack.ts
index a15c65b992..2251a2c9c8 100644
--- a/src/lib/addons/slack.ts
+++ b/src/lib/addons/slack.ts
@@ -129,7 +129,7 @@ This was changed by ${createdBy}.`;
         )}\`\`\``;
         return `${createdBy} ${action} feature toggle ${feature}
 ${enabled}${stale} | ${typeStr} | ${project}
-${strategies}`;
+${data.strategies ? strategies : ''}`;
     }
 
     getAction(type: string): string {
diff --git a/src/lib/addons/teams.ts b/src/lib/addons/teams.ts
index 1fe82e95c6..6902661546 100644
--- a/src/lib/addons/teams.ts
+++ b/src/lib/addons/teams.ts
@@ -113,7 +113,9 @@ export default class TeamsAddon extends Addon {
             data.strategies,
             { skipInvalid: true },
         )}`;
-        return `Feature toggle ${data.name} | ${typeStr} | ${project} <br /> ${strategies}`;
+        return `Feature toggle ${data.name} | ${typeStr} | ${project} <br /> ${
+            data.strategies ? strategies : ''
+        }`;
     }
 
     getAction(type: string): string {
diff --git a/src/lib/services/feature-toggle-service-v2.ts b/src/lib/services/feature-toggle-service-v2.ts
index f8d7fe8bcc..e640094b99 100644
--- a/src/lib/services/feature-toggle-service-v2.ts
+++ b/src/lib/services/feature-toggle-service-v2.ts
@@ -243,10 +243,13 @@ class FeatureToggleServiceV2 {
                 featureData.name,
                 projectId,
             );
+
+            const data = { featureData, projectId };
+
             await this.eventStore.store({
                 type: FEATURE_CREATED,
                 createdBy: userName,
-                data: featureData,
+                data,
             });
 
             return createdToggle;