diff --git a/internal/bridge/mock_Bridge.go b/internal/bridge/mock_Bridge.go
index 43e11058..f70448b4 100644
--- a/internal/bridge/mock_Bridge.go
+++ b/internal/bridge/mock_Bridge.go
@@ -1,4 +1,4 @@
-// Code generated by mockery v2.36.0. DO NOT EDIT.
+// Code generated by mockery v2.36.1. DO NOT EDIT.
 
 package bridge
 
diff --git a/internal/storage/mock_Storage.go b/internal/storage/mock_Storage.go
index 7982d032..3465520b 100644
--- a/internal/storage/mock_Storage.go
+++ b/internal/storage/mock_Storage.go
@@ -1,4 +1,4 @@
-// Code generated by mockery v2.36.0. DO NOT EDIT.
+// Code generated by mockery v2.36.1. DO NOT EDIT.
 
 package storage
 
@@ -27,20 +27,6 @@ func (_m *MockStorage) AddTickerUser(ticker *Ticker, user *User) error {
 	return r0
 }
 
-// DeleteAttachmentsByMessage provides a mock function with given fields: message
-func (_m *MockStorage) DeleteAttachmentsByMessage(message Message) error {
-	ret := _m.Called(message)
-
-	var r0 error
-	if rf, ok := ret.Get(0).(func(Message) error); ok {
-		r0 = rf(message)
-	} else {
-		r0 = ret.Error(0)
-	}
-
-	return r0
-}
-
 // DeleteMessage provides a mock function with given fields: message
 func (_m *MockStorage) DeleteMessage(message Message) error {
 	ret := _m.Called(message)
diff --git a/internal/storage/sql_storage.go b/internal/storage/sql_storage.go
index 5d0e36b6..5cf27ee9 100644
--- a/internal/storage/sql_storage.go
+++ b/internal/storage/sql_storage.go
@@ -277,17 +277,14 @@ func (s *SqlStorage) SaveMessage(message *Message) error {
 }
 
 func (s *SqlStorage) DeleteMessage(message Message) error {
-	var err error
-	err = s.DB.Delete(&message).Error
-	if err != nil {
-		return err
-	}
-
 	if len(message.Attachments) > 0 {
-		err = s.DeleteAttachmentsByMessage(message)
+		err := s.DB.Where("message_id = ?", message.ID).Delete(&Attachment{}).Error
+		if err != nil {
+			log.WithError(err).WithField("message_id", message.ID).Error("failed to delete attachments")
+		}
 	}
 
-	return err
+	return s.DB.Delete(&message).Error
 }
 
 func (s *SqlStorage) DeleteMessages(ticker Ticker) error {
@@ -305,10 +302,6 @@ func (s *SqlStorage) DeleteMessages(ticker Ticker) error {
 	return s.DB.Where("ticker_id = ?", ticker.ID).Delete(&Message{}).Error
 }
 
-func (s *SqlStorage) DeleteAttachmentsByMessage(message Message) error {
-	return s.DB.Where("message_id = ?", message.ID).Delete(&Attachment{}).Error
-}
-
 func (s *SqlStorage) GetInactiveSettings() InactiveSettings {
 	var setting Setting
 	err := s.DB.First(&setting, "name = ?", SettingInactiveName).Error
diff --git a/internal/storage/storage.go b/internal/storage/storage.go
index 4dae872e..f78f1235 100644
--- a/internal/storage/storage.go
+++ b/internal/storage/storage.go
@@ -39,7 +39,6 @@ type Storage interface {
 	SaveMessage(message *Message) error
 	DeleteMessage(message Message) error
 	DeleteMessages(ticker Ticker) error
-	DeleteAttachmentsByMessage(message Message) error
 	GetInactiveSettings() InactiveSettings
 	GetRefreshIntervalSettings() RefreshIntervalSettings
 	SaveInactiveSettings(inactiveSettings InactiveSettings) error