diff --git a/frontend/src/TakerApp.tsx b/frontend/src/TakerApp.tsx
index e5ae509..9223f29 100644
--- a/frontend/src/TakerApp.tsx
+++ b/frontend/src/TakerApp.tsx
@@ -148,6 +148,8 @@ export default function App() {
                                 calculateMargin(payload);
                             }}
                             value={format(quantity)}
+                            min={order?.min_quantity}
+                            max={order?.max_quantity}
                         />
 
                         <Text>Margin in BTC:</Text>
diff --git a/frontend/src/components/CurrencyInputField.tsx b/frontend/src/components/CurrencyInputField.tsx
index 47df0a3..4b12313 100644
--- a/frontend/src/components/CurrencyInputField.tsx
+++ b/frontend/src/components/CurrencyInputField.tsx
@@ -11,18 +11,27 @@ import React from "react";
 interface CurrencyInputFieldProps {
     onChange: any;
     value: StringOrNumber | undefined;
+    min?: number;
+    max?: number;
 }
 
 export default function CurrencyInputField(
     {
         onChange,
         value,
+        min,
+        max,
     }: CurrencyInputFieldProps,
 ) {
+    let minAmount = min || 0;
+    let maxAmount = max || Number.MAX_SAFE_INTEGER;
     return (
         <NumberInput
             onChange={onChange}
             value={value}
+            defaultValue={minAmount}
+            min={minAmount}
+            max={maxAmount}
         >
             <NumberInputField />
             <NumberInputStepper>