diff --git a/interactions/api/models/message.py b/interactions/api/models/message.py
index 028188d44..b884ba049 100644
--- a/interactions/api/models/message.py
+++ b/interactions/api/models/message.py
@@ -910,7 +910,7 @@ async def edit(
         if not components:
             _components = []
         elif components is MISSING:
-            _components = self.components
+            _components = _build_components(components=self.components)
         else:
             _components = _build_components(components=components)
 
diff --git a/interactions/client/context.py b/interactions/client/context.py
index 66e79db75..5244cb917 100644
--- a/interactions/client/context.py
+++ b/interactions/client/context.py
@@ -255,7 +255,7 @@ async def edit(
 
         if self.message.components is not None or components is not MISSING:
             if components is MISSING:
-                _components = self.message.components
+                _components = _build_components(components=self.message.components)
             elif not components:
                 _components = []
             else: