diff --git a/Common/Server/Services/AlertStateTimelineService.ts b/Common/Server/Services/AlertStateTimelineService.ts
index e07404ad94..f393ed01f8 100644
--- a/Common/Server/Services/AlertStateTimelineService.ts
+++ b/Common/Server/Services/AlertStateTimelineService.ts
@@ -114,7 +114,7 @@ export class Service extends DatabaseService<AlertStateTimeline> {
 
     const internalNote: string | undefined = (
       createBy.miscDataProps as JSONObject | undefined
-    )?.["publicNote"] as string | undefined;
+    )?.["internalNote"] as string | undefined;
 
     if (internalNote) {
       const alertNote: AlertInternalNote = new AlertInternalNote();
diff --git a/Common/Server/Services/DatabaseService.ts b/Common/Server/Services/DatabaseService.ts
index d3855a9cfd..0e6449e7a0 100644
--- a/Common/Server/Services/DatabaseService.ts
+++ b/Common/Server/Services/DatabaseService.ts
@@ -671,28 +671,25 @@ class DatabaseService<TBaseModel extends BaseModel> extends BaseService {
         );
       }
 
-      // hit workflow.;
-      if (this.getModel().enableWorkflowOn?.create) {
-        let tenantId: ObjectID | undefined = createBy.props.tenantId;
+      let tenantId: ObjectID | undefined = createBy.props.tenantId;
 
-        if (!tenantId && this.getModel().getTenantColumn()) {
-          tenantId = createBy.data.getValue<ObjectID>(
-            this.getModel().getTenantColumn()!,
-          );
-        }
+      if (!tenantId && this.getModel().getTenantColumn()) {
+        tenantId = createBy.data.getValue<ObjectID>(
+          this.getModel().getTenantColumn()!,
+        );
+      }
 
-        if (tenantId) {
-          await this.onTriggerWorkflow(
-            createBy.data.id!,
-            tenantId,
-            "on-create",
-          );
-          await this.onTriggerRealtime(
-            createBy.data.id!,
-            tenantId,
-            ModelEventType.Create,
-          );
-        }
+      // hit workflow.;
+      if (this.getModel().enableWorkflowOn?.create && tenantId) {
+        await this.onTriggerWorkflow(createBy.data.id!, tenantId, "on-create");
+      }
+
+      if (tenantId) {
+        await this.onTriggerRealtime(
+          createBy.data.id!,
+          tenantId,
+          ModelEventType.Create,
+        );
       }
 
       return createBy.data;