diff --git a/abstracto-application/abstracto-modules/suggestion/suggestion-impl/src/main/java/dev/sheldan/abstracto/suggestion/service/SuggestionServiceBean.java b/abstracto-application/abstracto-modules/suggestion/suggestion-impl/src/main/java/dev/sheldan/abstracto/suggestion/service/SuggestionServiceBean.java
index a72389419..36aeaf653 100644
--- a/abstracto-application/abstracto-modules/suggestion/suggestion-impl/src/main/java/dev/sheldan/abstracto/suggestion/service/SuggestionServiceBean.java
+++ b/abstracto-application/abstracto-modules/suggestion/suggestion-impl/src/main/java/dev/sheldan/abstracto/suggestion/service/SuggestionServiceBean.java
@@ -262,8 +262,9 @@ public class SuggestionServiceBean implements SuggestionService {
             if(throwable == null) {
                 model.setSuggester(user);
             }
-            self.updateSuggestionMessageText(reason, model).thenAccept(unused -> finalFuture.complete(null))
+            self.updateSuggestionMessageText(reason, model)
             .thenAccept(unused -> self.removeSuggestionButtons(serverId, channelId, originalMessageId, suggestionId))
+            .thenAccept(unused -> finalFuture.complete(null))
             .exceptionally(throwable1 -> {
                 finalFuture.completeExceptionally(throwable1);
                 return null;
diff --git a/abstracto-application/core/core-impl/src/main/java/dev/sheldan/abstracto/core/service/MessageServiceBean.java b/abstracto-application/core/core-impl/src/main/java/dev/sheldan/abstracto/core/service/MessageServiceBean.java
index 5a9149374..119af92a5 100644
--- a/abstracto-application/core/core-impl/src/main/java/dev/sheldan/abstracto/core/service/MessageServiceBean.java
+++ b/abstracto-application/core/core-impl/src/main/java/dev/sheldan/abstracto/core/service/MessageServiceBean.java
@@ -255,8 +255,7 @@ public class MessageServiceBean implements MessageService {
     @Override
     public CompletableFuture<Message> editMessageWithActionRowsMessage(Message message, List<ActionRow> rows) {
         metricService.incrementCounter(MESSAGE_EDIT_METRIC);
-        MessageEditData messageEditData = MessageEditData.fromMessage(message);
-        return message.editMessage(messageEditData).setComponents(rows).submit();
+        return message.editMessageComponents(rows).submit();
     }
 
     @Override