diff --git a/api/logics.py b/api/logics.py
index 6faffd0a..d710fe86 100644
--- a/api/logics.py
+++ b/api/logics.py
@@ -207,7 +207,9 @@ class Logics:
 
             if order.has_range:
                 take_order.amount = amount
-                take_order.save(update_fields=["amount"])
+            else:
+                take_order.amount = order.amount
+            take_order.save(update_fields=["amount"])
 
             order.log(
                 f"Pre-Taken by Robot({user.robot.id},{user.username}) for {order.amount} fiat units"
diff --git a/tests/test_trade_pipeline.py b/tests/test_trade_pipeline.py
index 2775aa55..ea58ed45 100644
--- a/tests/test_trade_pipeline.py
+++ b/tests/test_trade_pipeline.py
@@ -434,6 +434,7 @@ class TradeTest(BaseAPITestCase):
         )
         self.assertIsHash(data["maker_hash_id"])
         self.assertEqual(data["maker_status"], "Active")
+        self.assertAlmostEqual(float(data["amount"]), 80)
         self.assertFalse(data["is_maker"])
         self.assertFalse(data["is_buyer"])
         self.assertFalse(data["is_seller"])