diff --git a/packages/web/components/place-limit-tool/index.tsx b/packages/web/components/place-limit-tool/index.tsx
index ee0c14079a..57ed85b5b8 100644
--- a/packages/web/components/place-limit-tool/index.tsx
+++ b/packages/web/components/place-limit-tool/index.tsx
@@ -613,6 +613,7 @@ export const PlaceLimitTool: FunctionComponent<PlaceLimitToolProps> = observer(
           inAmountFiat={swapState.paymentFiatValue}
           fromAsset={swapState.marketState.fromAsset}
           toAsset={swapState.marketState.toAsset}
+          isBeyondOppositePrice={swapState.priceState.isBeyondOppositePrice}
         />
         <AddFundsModal
           isOpen={isAddFundsModalOpen}
diff --git a/packages/web/hooks/limit-orders/use-place-limit.ts b/packages/web/hooks/limit-orders/use-place-limit.ts
index 606458f8f3..e05805c9cf 100644
--- a/packages/web/hooks/limit-orders/use-place-limit.ts
+++ b/packages/web/hooks/limit-orders/use-place-limit.ts
@@ -97,8 +97,10 @@ export const usePlaceLimit = ({
   });
 
   const isMarket = useMemo(
-    () => type === "market" || priceState.isBeyondOppositePrice,
-    [type, priceState.isBeyondOppositePrice]
+    () => type === "market",
+    //|| priceState.isBeyondOppositePrice
+    // Disabled auto market placing but can be readded with the above conditional
+    [type]
   );
 
   const account = accountStore.getWallet(osmosisChainId);
diff --git a/packages/web/localizations/en.json b/packages/web/localizations/en.json
index 47b840c954..7c4f0e855a 100644
--- a/packages/web/localizations/en.json
+++ b/packages/web/localizations/en.json
@@ -1250,11 +1250,11 @@
     },
     "aboveMarket": {
       "title": "Limit price above market price",
-      "description": "If you proceed, your order will be processed as a market order at market price."
+      "description": "If you proceed, your order may be filled at an undesirable price."
     },
     "belowMarket": {
       "title": "Limit price below market price",
-      "description": "If you proceed, your order will be processed as a market order at market price."
+      "description": "If you proceed, your order may be filled at an undesirable price."
     },
     "enterAnAmountTo": "Enter an amount to",
     "sell": "Sell",
diff --git a/packages/web/modals/review-order.tsx b/packages/web/modals/review-order.tsx
index dda3ae6ceb..ee49ff70b6 100644
--- a/packages/web/modals/review-order.tsx
+++ b/packages/web/modals/review-order.tsx
@@ -54,6 +54,7 @@ interface ReviewOrderProps {
   fromAsset?: ReturnType<typeof useSwap>["fromAsset"];
   toAsset?: ReturnType<typeof useSwap>["toAsset"];
   page?: EventPage;
+  isBeyondOppositePrice?: boolean;
 }
 
 export function ReviewOrder({
@@ -81,6 +82,7 @@ export function ReviewOrder({
   toAsset,
   fromAsset,
   page,
+  isBeyondOppositePrice = false,
 }: ReviewOrderProps) {
   const { t } = useTranslation();
   // const { isMobile } = useWindowSize();
@@ -192,7 +194,7 @@ export function ReviewOrder({
       </span>
     );
   }, [gasAmount, isGasLoading, gasFeeError, t]);
-
+  console.log(tab === "sell" && isBeyondOppositePrice);
   return (
     <ModalBase
       isOpen={isOpen}
@@ -219,7 +221,8 @@ export function ReviewOrder({
             <div className="flex flex-col rounded-t-2xl border border-osmoverse-700 px-4 py-2">
               <div className="flex items-center gap-4">
                 <div className="flex h-10 min-w-10 items-center justify-center">
-                  {percentAdjusted?.isNegative() ? (
+                  {(tab === "buy" && !isBeyondOppositePrice) ||
+                  (tab === "sell" && isBeyondOppositePrice) ? (
                     <svg width="24" height="24" viewBox="0 0 24 24" fill="none">
                       <path
                         fillRule="evenodd"
@@ -255,10 +258,11 @@ export function ReviewOrder({
                           height={6}
                           className={classNames({
                             "rotate-180 text-bullish-400":
-                              percentAdjusted.isPositive(),
+                              (tab === "buy" && isBeyondOppositePrice) ||
+                              (tab === "sell" && !isBeyondOppositePrice),
                             "rotate-0 text-rust-500":
-                              percentAdjusted.isNegative(),
-                            "opacity-0": percentAdjusted.isZero(),
+                              (tab === "buy" && !isBeyondOppositePrice) ||
+                              (tab === "sell" && isBeyondOppositePrice),
                           })}
                         />
                       )}
@@ -383,15 +387,45 @@ export function ReviewOrder({
             </div>
           </div>
           <div className="flex flex-col">
-            <div className="flex flex-col py-3">
+            <div
+              className={classNames("flex flex-col py-3", {
+                "text-rust-400": isBeyondOppositePrice,
+              })}
+            >
               <RecapRow
                 left={t("limitOrders.orderType")}
                 right={
-                  <span className="text-osmoverse-100">
-                    {orderType === "limit"
-                      ? t("limitOrders.limit")
-                      : t("limitOrders.market")}
-                  </span>
+                  <GenericDisclaimer
+                    disabled={!isBeyondOppositePrice}
+                    title={
+                      <span className="caption">
+                        {tab === "buy"
+                          ? t(`limitOrders.aboveMarket.title`)
+                          : t(`limitOrders.belowMarket.title`)}
+                      </span>
+                    }
+                    body={
+                      <span className="text-caption text-osmoverse-300">
+                        {tab === "buy"
+                          ? t(`limitOrders.aboveMarket.description`)
+                          : t(`limitOrders.belowMarket.description`)}
+                      </span>
+                    }
+                  >
+                    <div className="flex items-center justify-center">
+                      {isBeyondOppositePrice && (
+                        <Icon
+                          id="alert-circle"
+                          className="mr-2"
+                          width={16}
+                          height={16}
+                        />
+                      )}
+                      {orderType === "limit"
+                        ? t("limitOrders.limit")
+                        : t("limitOrders.market")}
+                    </div>
+                  </GenericDisclaimer>
                 }
               />
               {slippageConfig && orderType === "market" && (
@@ -583,6 +617,28 @@ export function ReviewOrder({
                 <a className="text-wosmongton-300">Learn more</a>
               </span>
             </div> */}
+            {isBeyondOppositePrice && (
+              <div className="flex items-start gap-3 rounded-3x4pxlinset border-2 border-solid border-rust-500 p-5">
+                <Icon
+                  id="alert-triangle"
+                  width={24}
+                  height={24}
+                  className="text-rust-400"
+                />
+                <div className="flex flex-col gap-1">
+                  <span className="body2">
+                    {tab === "buy"
+                      ? t(`limitOrders.aboveMarket.title`)
+                      : t(`limitOrders.belowMarket.title`)}
+                  </span>
+                  <span className="body2 text-osmoverse-300">
+                    {tab === "buy"
+                      ? t(`limitOrders.aboveMarket.description`)
+                      : t(`limitOrders.belowMarket.description`)}
+                  </span>
+                </div>
+              </div>
+            )}
             {!diffGteSlippage && (
               <div className="flex w-full justify-between gap-3 pt-3">
                 <Button