diff --git a/webapp/channels/src/components/self_hosted_purchases/self_hosted_expansion_modal/expansion_card.tsx b/webapp/channels/src/components/self_hosted_purchases/self_hosted_expansion_modal/expansion_card.tsx
index aa9a5edfb8..3bd91c348d 100644
--- a/webapp/channels/src/components/self_hosted_purchases/self_hosted_expansion_modal/expansion_card.tsx
+++ b/webapp/channels/src/components/self_hosted_purchases/self_hosted_expansion_modal/expansion_card.tsx
@@ -24,7 +24,7 @@ const MAX_TRANSACTION_VALUE = 1_000_000 - 1;
 interface Props {
     canSubmit: boolean;
     licensedSeats: number;
-    initialSeats: number;
+    minimumSeats: number;
     submit: () => void;
     updateSeats: (seats: number) => void;
 }
@@ -34,10 +34,10 @@ export default function SelfHostedExpansionCard(props: Props) {
     const license = useSelector(getLicense);
     const startsAt = moment(parseInt(license.StartsAt, 10)).format('MMM. D, YYYY');
     const endsAt = moment(parseInt(license.ExpiresAt, 10)).format('MMM. D, YYYY');
-    const [additionalSeats, setAdditionalSeats] = useState(props.initialSeats);
+    const [additionalSeats, setAdditionalSeats] = useState(props.minimumSeats);
     const [overMaxSeats, setOverMaxSeats] = useState(false);
     const licenseExpiry = new Date(parseInt(license.ExpiresAt, 10));
-    const invalidAdditionalSeats = additionalSeats === 0 || isNaN(additionalSeats);
+    const invalidAdditionalSeats = additionalSeats === 0 || isNaN(additionalSeats) || additionalSeats < props.minimumSeats;
     const [products] = useGetSelfHostedProducts();
     const currentProduct = findSelfHostedProductBySku(products, license.SkuShortName);
     const costPerMonth = currentProduct?.price_per_seat || 0;
@@ -76,9 +76,9 @@ export default function SelfHostedExpansionCard(props: Props) {
     const maxAdditionalSeats = getMaximumAdditionalSeats();
 
     const handleNewSeatsInputChange = (e: React.ChangeEvent<HTMLInputElement>) => {
-        const requestedSeats = parseInt(e.target.value, 10);
+        let requestedSeats = parseInt(e.target.value, 10);
 
-        if (requestedSeats <= 0) {
+        if (!isNaN(requestedSeats) && requestedSeats <= 0) {
             e.preventDefault();
             return;
         }
@@ -141,12 +141,11 @@ export default function SelfHostedExpansionCard(props: Props) {
                         type='number'
                         value={additionalSeats}
                         onChange={handleNewSeatsInputChange}
-                        error={invalidAdditionalSeats}
                         disabled={maxAdditionalSeats === 0}
                     />
                 </div>
                 <div className='SelfHostedExpansionRHSCard__AddSeatsWarning'>
-                    {invalidAdditionalSeats && !overMaxSeats &&
+                    {invalidAdditionalSeats && !overMaxSeats && isNaN(additionalSeats) &&
                         <FormattedMessage
                             id='self_hosted_expansion_rhs_card_must_add_seats_warning'
                             defaultMessage='{warningIcon} You must add a seat to continue'
@@ -155,6 +154,16 @@ export default function SelfHostedExpansionCard(props: Props) {
                             }}
                         />
                     }
+                    {invalidAdditionalSeats && additionalSeats < props.minimumSeats &&
+                        <FormattedMessage
+                            id='self_hosted_expansion_rhs_card_must_purchase_enough_seats'
+                            defaultMessage='{warningIcon} You must purchase at least {minimumSeats} seats to be compliant with your license'
+                            values={{
+                                warningIcon: <WarningIcon additionalClassName={'SelfHostedExpansionRHSCard__warning'}/>,
+                                minimumSeats: props.minimumSeats
+                            }}
+                        />
+                    }
                     {overMaxSeats && maxAdditionalSeats > 0 &&
                         <FormattedMessage
                             id='self_hosted_expansion_rhs_card_maximum_seats_warning'
@@ -203,7 +212,7 @@ export default function SelfHostedExpansionCard(props: Props) {
                 </div>
                 <button
                     className='btn btn-primary SelfHostedExpansionRHSCard__CompletePurchaseButton'
-                    disabled={!props.canSubmit || maxAdditionalSeats === 0}
+                    disabled={!props.canSubmit || maxAdditionalSeats === 0 || invalidAdditionalSeats}
                     onClick={props.submit}
                 >
                     <FormattedMessage
diff --git a/webapp/channels/src/components/self_hosted_purchases/self_hosted_expansion_modal/index.tsx b/webapp/channels/src/components/self_hosted_purchases/self_hosted_expansion_modal/index.tsx
index 20b87d862e..48b1e276f8 100644
--- a/webapp/channels/src/components/self_hosted_purchases/self_hosted_expansion_modal/index.tsx
+++ b/webapp/channels/src/components/self_hosted_purchases/self_hosted_expansion_modal/index.tsx
@@ -175,12 +175,13 @@ export default function SelfHostedExpansionModal() {
     const licensedSeats = parseInt(license.Users, 10);
     const currentPlan = license.SkuName;
     const activeUsers = useSelector(getFilteredUsersStats)?.total_users_count || 0;
-    const [additionalSeats, setAdditionalSeats] = useState(activeUsers <= licensedSeats ? 1 : activeUsers - licensedSeats);
+    const [minimumSeats] = useState(activeUsers <= licensedSeats ? 1 : activeUsers - licensedSeats);
+    const [requestedSeats, setRequestedSeats] = useState(minimumSeats)
 
     const [stripeLoadHint, setStripeLoadHint] = useState(Math.random());
     const stripeRef = useLoadStripe(stripeLoadHint);
 
-    const initialState = makeInitialState(additionalSeats);
+    const initialState = makeInitialState(requestedSeats);
     const [formState, setFormState] = useState<FormState>(initialState);
     const [show] = useState(true);
     const canRetry = formState.error !== '422';
@@ -492,12 +493,12 @@ export default function SelfHostedExpansionModal() {
                                 <SelfHostedExpansionCard
                                     updateSeats={(seats: number) => {
                                         setFormState({...formState, seats});
-                                        setAdditionalSeats(seats);
+                                        setRequestedSeats(seats);
                                     }}
                                     canSubmit={canSubmitForm}
                                     submit={submit}
                                     licensedSeats={licensedSeats}
-                                    initialSeats={additionalSeats}
+                                    minimumSeats={minimumSeats}
                                 />
                             </div>
                         </div>