diff --git a/messaging/service/message.go b/messaging/service/message.go
index 09207366c..647fe7534 100644
--- a/messaging/service/message.go
+++ b/messaging/service/message.go
@@ -364,22 +364,18 @@ func (svc message) Delete(messageID uint64) error {
 			return ErrNoPermissions.withStack()
 		}
 
+		if deletedMsg.UserID == currentUserID && !svc.ac.CanUpdateOwnMessages(svc.ctx, ch) {
+			return ErrNoPermissions.withStack()
+		} else if deletedMsg.UserID != currentUserID && !svc.ac.CanUpdateMessages(svc.ctx, ch) {
+			return ErrNoPermissions.withStack()
+		}
+
 		if deletedMsg.ReplyTo > 0 {
 			original, err = svc.message.FindByID(deletedMsg.ReplyTo)
 			if err != nil {
 				return err
 			}
 
-			if ch, err = svc.channel.FindByID(original.ChannelID); err != nil {
-				return
-			}
-
-			if original.UserID == currentUserID && !svc.ac.CanUpdateOwnMessages(svc.ctx, ch) {
-				return ErrNoPermissions.withStack()
-			} else if original.UserID != currentUserID && !svc.ac.CanUpdateMessages(svc.ctx, ch) {
-				return ErrNoPermissions.withStack()
-			}
-
 			// This is a reply to another message, decrease reply counter on the original, on struct and in the
 			// repository
 			if original.Replies > 0 {