diff --git a/app/Http/Controllers/AlarmControllerCommon.php b/app/Http/Controllers/AlarmControllerCommon.php
index 1c243a9..8456f26 100644
--- a/app/Http/Controllers/AlarmControllerCommon.php
+++ b/app/Http/Controllers/AlarmControllerCommon.php
@@ -30,16 +30,16 @@ class AlarmControllerCommon extends Controller
             $alarmData = [
                 'type'       => $request->type ?? null,
                 'severity'       => $request->severity ?? null,
-                'acknowledged'      => false ?? null,
-                'cleared'    => $request->cleared ?? Carbon::now()->timestamp,
+                'acknowledged'      => false,
+                'cleared'    => false,
                 'startTs'    => $request->startTs ?? Carbon::now()->timestamp,
                 'endTs'    => $request->endTs ?? Carbon::now()->timestamp,
                 'details' => $request->details ?? [],
-                'propagate'    => $request->propagate ?? false,
-                'propagateToOwner'    => $request->propagateToOwner ?? false,
-                'propagateToTenant'    => $request->propagateToTenant ?? false,
+                'propagate'    => true,
+                'propagateToOwner'    => true,
+                'propagateToTenant'    => true,
                 'originator'    => $request->originator ?? 1,
-                'assigneeId'    => $request->assigneeId ?? 1,
+                // 'assigneeId'    => $request->assigneeId ?? 1,
 
 
             ];
diff --git a/app/Services/AlarmService.php b/app/Services/AlarmService.php
index 74614aa..5b3f93e 100644
--- a/app/Services/AlarmService.php
+++ b/app/Services/AlarmService.php
@@ -395,10 +395,10 @@ class AlarmService
                 'id' => $data['originator'] ?? null,
                 'entityType' => 'DEVICE'
             ],
-            'assigneeId' => [
-                'id' => $data['assigneeId'] ?? null,
-                'entityType' => 'USER'
-            ],
+            // 'assigneeId' => [
+            //     'id' => $data['assigneeId'] ?? null,
+            //     'entityType' => 'USER'
+            // ],
             'details' => $data['details'] ?? [],
             'propagate'    => $data['propagate'] ?? false,
             'propagateToOwner'    => $data['propagateToOwner'] ?? false,