diff --git a/rest/src/main/kotlin/builder/webhook/EditWebhookMessageBuilder.kt b/rest/src/main/kotlin/builder/webhook/EditWebhookMessageBuilder.kt
index 4ca20fa34e5e..523d7bc20965 100644
--- a/rest/src/main/kotlin/builder/webhook/EditWebhookMessageBuilder.kt
+++ b/rest/src/main/kotlin/builder/webhook/EditWebhookMessageBuilder.kt
@@ -4,7 +4,6 @@ import dev.kord.common.annotation.KordPreview
 import dev.kord.common.entity.AllowedMentions
 import dev.kord.common.entity.optional.Optional
 import dev.kord.common.entity.optional.delegate.delegate
-import dev.kord.common.entity.optional.mapList
 import dev.kord.rest.builder.RequestBuilder
 import dev.kord.rest.builder.component.ActionRowBuilder
 import dev.kord.rest.builder.component.MessageComponentBuilder
@@ -25,29 +24,21 @@ class EditWebhookMessageBuilder : RequestBuilder<MultipartWebhookEditMessageRequ
     private var _content: Optional<String> = Optional.Missing()
     var content: String? by ::_content.delegate()
 
-    private var _embeds: Optional<MutableList<EmbedBuilder>> = Optional.Missing()
-    var embeds: MutableList<EmbedBuilder>? by ::_embeds.delegate()
+    var embeds: MutableList<EmbedBuilder> = mutableListOf()
 
     val files: MutableList<Pair<String, InputStream>> = mutableListOf()
 
     private var _allowedMentions: Optional<AllowedMentions> = Optional.Missing()
     var allowedMentions: AllowedMentions? by ::_allowedMentions.delegate()
 
-    @OptIn(KordPreview::class)
-    private var _components: Optional<MutableList<MessageComponentBuilder>> = Optional.Missing()
-
-    @KordPreview
-    var components: MutableList<MessageComponentBuilder>? by ::_components.delegate()
+    val components: MutableList<MessageComponentBuilder> = mutableListOf()
 
     @OptIn(ExperimentalContracts::class)
     inline fun embed(builder: EmbedBuilder.() -> Unit) {
         contract {
             callsInPlace(builder, InvocationKind.EXACTLY_ONCE)
         }
-
-        embeds = (embeds ?: mutableListOf()).also {
-            it.add(EmbedBuilder().apply(builder))
-        }
+        embeds.add(EmbedBuilder().apply(builder))
     }
 
     fun addFile(name: String, content: InputStream) {
@@ -65,17 +56,15 @@ class EditWebhookMessageBuilder : RequestBuilder<MultipartWebhookEditMessageRequ
             callsInPlace(builder, InvocationKind.EXACTLY_ONCE)
         }
 
-        components = (components ?: mutableListOf()).also {
-            it.add(ActionRowBuilder().apply(builder))
-        }
+        components.add(ActionRowBuilder().apply(builder))
     }
 
     override fun toRequest(): MultipartWebhookEditMessageRequest = MultipartWebhookEditMessageRequest(
         WebhookEditMessageRequest(
             _content,
-            _embeds.mapList { it.toRequest() },
+            Optional.missingOnEmpty(embeds.map(EmbedBuilder::toRequest)),
             _allowedMentions,
-            _components.mapList { it.build() }
+            Optional.missingOnEmpty(components.map { it.build() })
         ),
         files
     )