diff --git a/application/src/main/java/org/thingsboard/server/service/entitiy/alarm/DefaultTbAlarmService.java b/application/src/main/java/org/thingsboard/server/service/entitiy/alarm/DefaultTbAlarmService.java
index 05c3ef45f6..d0ded074f6 100644
--- a/application/src/main/java/org/thingsboard/server/service/entitiy/alarm/DefaultTbAlarmService.java
+++ b/application/src/main/java/org/thingsboard/server/service/entitiy/alarm/DefaultTbAlarmService.java
@@ -203,12 +203,12 @@ public class DefaultTbAlarmService extends AbstractTbEntityService implements Tb
         try {
             deleted = alarmSubscriptionService.deleteAlarm(tenantId, alarmId);
         } catch (Exception e) {
-            logEntityActionService.logEntityAction(tenantId, alarmOriginatorId, ActionType.ALARM_DELETE, user, e, alarmId);
+            logEntityActionService.logEntityAction(tenantId, alarmOriginatorId == null ? alarmId: alarmOriginatorId, ActionType.ALARM_DELETE, user, e, alarmId);
             throw e;
         }
 
         if (deleted) {
-            logEntityActionService.logEntityAction(tenantId, alarmOriginatorId, alarm, alarm.getCustomerId(), ActionType.ALARM_DELETE, user, alarmId);
+            logEntityActionService.logEntityAction(tenantId, alarmOriginatorId == null ? alarmId: alarmOriginatorId, alarm, alarm.getCustomerId(), ActionType.ALARM_DELETE, user, alarmId);
         }
 
         return deleted;
diff --git a/application/src/test/java/org/thingsboard/server/service/entitiy/alarm/DefaultTbAlarmServiceTest.java b/application/src/test/java/org/thingsboard/server/service/entitiy/alarm/DefaultTbAlarmServiceTest.java
index 96e4444ffd..ac2c9b692d 100644
--- a/application/src/test/java/org/thingsboard/server/service/entitiy/alarm/DefaultTbAlarmServiceTest.java
+++ b/application/src/test/java/org/thingsboard/server/service/entitiy/alarm/DefaultTbAlarmServiceTest.java
@@ -203,7 +203,7 @@ class DefaultTbAlarmServiceTest {
                 .isInstanceOf(RuntimeException.class)
                 .hasMessage("failed to delete alarm");
 
-        verify(logEntityActionService).logEntityAction(tenantId, new DeviceId(EntityId.NULL_UUID), ActionType.ALARM_DELETE, user, exception, alarm.getId());
+        verify(logEntityActionService).logEntityAction(tenantId, alarmOriginator, ActionType.ALARM_DELETE, user, exception, alarm.getId());
         verify(alarmSubscriptionService).deleteAlarm(tenantId, alarm.getId());
     }