diff --git a/apps/hyperdrive-trading/src/ui/hyperdrive/longs/OpenLongPreview/OpenLongPreview.tsx b/apps/hyperdrive-trading/src/ui/hyperdrive/longs/OpenLongPreview/OpenLongPreview.tsx
index b7b3f3328..4a26bc885 100644
--- a/apps/hyperdrive-trading/src/ui/hyperdrive/longs/OpenLongPreview/OpenLongPreview.tsx
+++ b/apps/hyperdrive-trading/src/ui/hyperdrive/longs/OpenLongPreview/OpenLongPreview.tsx
@@ -49,7 +49,6 @@ export function OpenLongPreview({
     tokens: appConfig.tokens,
   });
   const { fixedAPR } = useCurrentFixedAPR(hyperdrive.address);
-
   const termLengthMS = Number(hyperdrive.poolConfig.positionDuration * 1000n);
   const numDays = convertMillisecondsToDays(termLengthMS);
   return (
@@ -68,7 +67,7 @@ export function OpenLongPreview({
         <LabelValue
           label="You receive"
           value={
-            openLongPreviewStatus === "loading" ? (
+            openLongPreviewStatus === "loading" && long.bondAmount ? (
               <Skeleton width={100} />
             ) : (
               <span className="font-bold">{`${formatBalance({
@@ -82,7 +81,7 @@ export function OpenLongPreview({
         <LabelValue
           label="Pool fee"
           value={
-            openLongPreviewStatus === "loading" ? (
+            openLongPreviewStatus === "loading" && long.bondAmount ? (
               <Skeleton width={100} />
             ) : (
               <span
@@ -106,7 +105,7 @@ export function OpenLongPreview({
         <LabelValue
           label="Net fixed rate"
           value={
-            openLongPreviewStatus === "loading" ? (
+            openLongPreviewStatus === "loading" && long.bondAmount ? (
               <Skeleton width={100} />
             ) : (
               <span
@@ -140,7 +139,7 @@ export function OpenLongPreview({
         <LabelValue
           label="Market rate after open"
           value={
-            openLongPreviewStatus === "loading" ? (
+            openLongPreviewStatus === "loading" && long.bondAmount ? (
               <Skeleton width={100} />
             ) : (
               <span
@@ -162,7 +161,7 @@ export function OpenLongPreview({
         <LabelValue
           label="Fixed APR impact"
           value={
-            openLongPreviewStatus === "loading" ? (
+            openLongPreviewStatus === "loading" && long.bondAmount ? (
               <Skeleton width={100} />
             ) : (
               <span
@@ -190,7 +189,7 @@ export function OpenLongPreview({
         <LabelValue
           label="Yield at maturity"
           value={
-            openLongPreviewStatus === "loading" ? (
+            openLongPreviewStatus === "loading" && long.bondAmount ? (
               <Skeleton width={100} />
             ) : (
               <div
diff --git a/apps/hyperdrive-trading/src/ui/hyperdrive/shorts/OpenShortForm/OpenShortForm.tsx b/apps/hyperdrive-trading/src/ui/hyperdrive/shorts/OpenShortForm/OpenShortForm.tsx
index 55c233a32..76730bd13 100644
--- a/apps/hyperdrive-trading/src/ui/hyperdrive/shorts/OpenShortForm/OpenShortForm.tsx
+++ b/apps/hyperdrive-trading/src/ui/hyperdrive/shorts/OpenShortForm/OpenShortForm.tsx
@@ -5,6 +5,7 @@ import {
   HyperdriveConfig,
 } from "@hyperdrive/appconfig";
 import { MouseEvent, ReactElement } from "react";
+import Skeleton from "react-loading-skeleton";
 import { convertMillisecondsToDays } from "src/base/convertMillisecondsToDays";
 import { getIsValidTradeSize } from "src/hyperdrive/getIsValidTradeSize";
 import { getHasEnoughAllowance } from "src/token/getHasEnoughAllowance";
@@ -236,13 +237,27 @@ export function OpenShortForm({
           shortSize={amountOfBondsToShortAsBigInt}
           spotRateAfterOpen={spotRateAfterOpen}
           curveFee={curveFee}
+          openShortPreviewStatus={openShortPreviewStatus}
         />
       }
       disclaimer={(() => {
-        if (traderDeposit && !!amountOfBondsToShortAsBigInt) {
+        if (!amountOfBondsToShortAsBigInt) {
+          return null;
+        } else if (!!amountOfBondsToShortAsBigInt && !hasEnoughLiquidity) {
+          return (
+            <p className="text-center text-sm text-error">
+              Pool limit exceeded. Max short size is{" "}
+              {formatBalance({
+                balance: maxBondsOut || 0n,
+                decimals: hyperdrive.decimals,
+              })}{" "}
+              hy{baseToken.symbol}
+            </p>
+          );
+        } else {
           return (
             <div className="flex flex-col gap-4">
-              {!hasEnoughBalance ? (
+              {!hasEnoughBalance && openShortPreviewStatus !== "loading" ? (
                 <p className="text-center text-sm text-error">
                   Insufficient balance
                 </p>
@@ -250,22 +265,34 @@ export function OpenShortForm({
               <p className="text-center text-sm text-neutral-content">
                 You pay{" "}
                 <strong>
-                  {formatBalance({
-                    balance: traderDeposit || 0n,
-                    decimals: activeToken.decimals,
-                    includeCommas: true,
-                    places: activeToken.places,
-                  })}{" "}
-                  {activeToken.symbol}
+                  {openShortPreviewStatus === "loading" ? (
+                    // make this an inline skeleton
+                    <span className="inline-block">
+                      <Skeleton width={50} />
+                    </span>
+                  ) : (
+                    formatBalance({
+                      balance: traderDeposit || 0n,
+                      decimals: activeToken.decimals,
+                      includeCommas: true,
+                      places: activeToken.places,
+                    })
+                  )}{" "}
                 </strong>{" "}
                 in exchange for the yield on{" "}
                 <strong>
-                  {formatBalance({
-                    balance: amountOfBondsToShortAsBigInt,
-                    decimals: activeToken.decimals,
-                    includeCommas: true,
-                    places: activeToken.places,
-                  })}{" "}
+                  {openShortPreviewStatus === "loading" ? (
+                    <span className="inline-block">
+                      <Skeleton width={50} />
+                    </span>
+                  ) : (
+                    formatBalance({
+                      balance: amountOfBondsToShortAsBigInt,
+                      decimals: activeToken.decimals,
+                      includeCommas: true,
+                      places: activeToken.places,
+                    })
+                  )}{" "}
                   {baseToken.symbol}
                 </strong>{" "}
                 deposited into{" "}
@@ -285,18 +312,6 @@ export function OpenShortForm({
             </div>
           );
         }
-        if (!!amountOfBondsToShortAsBigInt && !hasEnoughLiquidity) {
-          return (
-            <p className="text-center text-sm text-error">
-              Pool limit exceeded. Max short size is{" "}
-              {formatBalance({
-                balance: maxBondsOut || 0n,
-                decimals: hyperdrive.decimals,
-              })}{" "}
-              hy{baseToken.symbol}
-            </p>
-          );
-        }
       })()}
       actionButton={(() => {
         if (!account) {
diff --git a/apps/hyperdrive-trading/src/ui/hyperdrive/shorts/OpenShortPreview/OpenShortPreview.tsx b/apps/hyperdrive-trading/src/ui/hyperdrive/shorts/OpenShortPreview/OpenShortPreview.tsx
index da46e593c..a450bd9db 100644
--- a/apps/hyperdrive-trading/src/ui/hyperdrive/shorts/OpenShortPreview/OpenShortPreview.tsx
+++ b/apps/hyperdrive-trading/src/ui/hyperdrive/shorts/OpenShortPreview/OpenShortPreview.tsx
@@ -6,6 +6,7 @@ import {
 import classNames from "classnames";
 import * as dnum from "dnum";
 import { ReactElement } from "react";
+import Skeleton from "react-loading-skeleton";
 import { convertMillisecondsToDays } from "src/base/convertMillisecondsToDays";
 import { formatRate } from "src/base/formatRate";
 import { useAppConfig } from "src/ui/appconfig/useAppConfig";
@@ -20,6 +21,7 @@ interface OpenShortPreviewProps {
   shortSize: bigint | undefined;
   spotRateAfterOpen: bigint | undefined;
   curveFee: bigint | undefined;
+  openShortPreviewStatus: "error" | "idle" | "loading" | "success";
 }
 
 export function OpenShortPreview({
@@ -29,6 +31,7 @@ export function OpenShortPreview({
   shortSize,
   spotRateAfterOpen,
   curveFee,
+  openShortPreviewStatus,
 }: OpenShortPreviewProps): ReactElement {
   const appConfig = useAppConfig();
   const baseToken = findBaseToken({
@@ -36,7 +39,6 @@ export function OpenShortPreview({
     tokens: appConfig.tokens,
   });
   const { fixedAPR } = useCurrentFixedAPR(hyperdrive.address);
-
   const termLengthMS = Number(hyperdrive.poolConfig.positionDuration * 1000n);
   return (
     <div className="flex flex-col gap-3">
@@ -60,35 +62,43 @@ export function OpenShortPreview({
       <LabelValue
         label="Pool fee"
         value={
-          <span
-            className="daisy-tooltip daisy-tooltip-top daisy-tooltip-left cursor-help border-b border-dashed border-current before:border"
-            data-tip="Total combined fee paid to LPs and governance to open the short."
-          >
-            {curveFee
-              ? `${formatBalance({
-                  balance: curveFee,
-                  decimals: tokenIn.decimals,
-                  places: tokenIn.places,
-                })} ${tokenIn.symbol}`
-              : `0 ${tokenIn.symbol}`}
-          </span>
+          openShortPreviewStatus === "loading" && shortSize ? (
+            <Skeleton width={100} />
+          ) : (
+            <span
+              className="daisy-tooltip daisy-tooltip-top daisy-tooltip-left cursor-help border-b border-dashed border-current before:border"
+              data-tip="Total combined fee paid to LPs and governance to open the short."
+            >
+              {curveFee
+                ? `${formatBalance({
+                    balance: curveFee,
+                    decimals: tokenIn.decimals,
+                    places: tokenIn.places,
+                  })} ${tokenIn.symbol}`
+                : `0 ${tokenIn.symbol}`}
+            </span>
+          )
         }
       />
       <LabelValue
         label="You pay"
         value={
-          <span
-            className="daisy-tooltip daisy-tooltip-top daisy-tooltip-left cursor-help border-b border-dashed border-current before:border"
-            data-tip="The upfront cost to open a short."
-          >
-            {costBasis
-              ? `${formatBalance({
-                  balance: costBasis,
-                  decimals: tokenIn.decimals,
-                  places: tokenIn.places,
-                })} ${tokenIn.symbol}`
-              : `0 ${tokenIn.symbol}`}
-          </span>
+          openShortPreviewStatus === "loading" && shortSize ? (
+            <Skeleton width={100} />
+          ) : (
+            <span
+              className="daisy-tooltip daisy-tooltip-top daisy-tooltip-left cursor-help border-b border-dashed border-current before:border"
+              data-tip="The upfront cost to open a short."
+            >
+              {costBasis
+                ? `${formatBalance({
+                    balance: costBasis,
+                    decimals: tokenIn.decimals,
+                    places: tokenIn.places,
+                  })} ${tokenIn.symbol}`
+                : `0 ${tokenIn.symbol}`}
+            </span>
+          )
         }
       />
       <div className="flex flex-col gap-3">
@@ -96,34 +106,44 @@ export function OpenShortPreview({
         <LabelValue
           label="Fixed APR after open"
           value={
-            <span
-              className={classNames(
-                "daisy-tooltip daisy-tooltip-top daisy-tooltip-left cursor-help before:border",
-                { "border-b border-dashed border-current": spotRateAfterOpen },
-              )}
-              data-tip="The market fixed rate after opening the short."
-            >
-              {spotRateAfterOpen
-                ? `${formatRate(spotRateAfterOpen)}% APR`
-                : "-"}
-            </span>
+            openShortPreviewStatus === "loading" && shortSize ? (
+              <Skeleton width={100} />
+            ) : (
+              <span
+                className={classNames(
+                  "daisy-tooltip daisy-tooltip-top daisy-tooltip-left cursor-help before:border",
+                  {
+                    "border-b border-dashed border-current": spotRateAfterOpen,
+                  },
+                )}
+                data-tip="The market fixed rate after opening the short."
+              >
+                {spotRateAfterOpen
+                  ? `${formatRate(spotRateAfterOpen)}% APR`
+                  : "-"}
+              </span>
+            )
           }
         />
         <LabelValue
           label="Fixed APR impact"
           value={
-            <span
-              className={classNames(
-                "daisy-tooltip daisy-tooltip-top daisy-tooltip-left cursor-help  before:border",
-                {
-                  "border-b border-dashed border-success text-success":
-                    spotRateAfterOpen,
-                },
-              )}
-              data-tip={`The net market impact on the fixed rate after opening the short.`}
-            >
-              {getMarketImpactLabel(fixedAPR?.apr, spotRateAfterOpen)}
-            </span>
+            openShortPreviewStatus === "loading" && shortSize ? (
+              <Skeleton width={100} />
+            ) : (
+              <span
+                className={classNames(
+                  "daisy-tooltip daisy-tooltip-top daisy-tooltip-left cursor-help  before:border",
+                  {
+                    "border-b border-dashed border-success text-success":
+                      spotRateAfterOpen,
+                  },
+                )}
+                data-tip={`The net market impact on the fixed rate after opening the short.`}
+              >
+                {getMarketImpactLabel(fixedAPR?.apr, spotRateAfterOpen)}
+              </span>
+            )
           }
         />
       </div>
diff --git a/apps/hyperdrive-trading/src/ui/hyperdrive/shorts/hooks/usePreviewOpenShort.ts b/apps/hyperdrive-trading/src/ui/hyperdrive/shorts/hooks/usePreviewOpenShort.ts
index 71dedfda3..9b5f95159 100644
--- a/apps/hyperdrive-trading/src/ui/hyperdrive/shorts/hooks/usePreviewOpenShort.ts
+++ b/apps/hyperdrive-trading/src/ui/hyperdrive/shorts/hooks/usePreviewOpenShort.ts
@@ -2,6 +2,7 @@ import { MutationStatus, useQuery } from "@tanstack/react-query";
 import { makeQueryKey } from "src/base/makeQueryKey";
 import { useReadHyperdrive } from "src/ui/hyperdrive/hooks/useReadHyperdrive";
 import { Address } from "viem";
+import { useBlockNumber } from "wagmi";
 
 interface UsePreviewOpenShortOptions {
   hyperdriveAddress: Address;
@@ -23,6 +24,8 @@ export function usePreviewOpenShort({
   asBase,
 }: UsePreviewOpenShortOptions): UsePreviewOpenShortResult {
   const readHyperdrive = useReadHyperdrive(hyperdriveAddress);
+
+  const { data: blockNumber } = useBlockNumber({ watch: true });
   const queryEnabled = !!readHyperdrive && !!amountOfBondsToShort;
 
   const { data, status } = useQuery({
@@ -30,6 +33,7 @@ export function usePreviewOpenShort({
       hyperdrive: hyperdriveAddress,
       amountBondShorts: amountOfBondsToShort?.toString(),
       asBase,
+      blockNumber: blockNumber?.toString(),
     }),
     enabled: queryEnabled,
     queryFn: queryEnabled