diff --git a/libs/deal-ticket/src/components/deal-ticket/deal-ticket-fee-details.tsx b/libs/deal-ticket/src/components/deal-ticket/deal-ticket-fee-details.tsx
index d68c192b5..095311cc7 100644
--- a/libs/deal-ticket/src/components/deal-ticket/deal-ticket-fee-details.tsx
+++ b/libs/deal-ticket/src/components/deal-ticket/deal-ticket-fee-details.tsx
@@ -1,5 +1,6 @@
 import { Tooltip } from '@vegaprotocol/ui-toolkit';
 import type { ReactNode } from 'react';
+import { useMemo } from 'react';
 import type { OrderSubmissionBody } from '@vegaprotocol/wallet';
 import type { Market, MarketData } from '@vegaprotocol/market-list';
 import {
@@ -26,7 +27,7 @@ export const DealTicketFeeDetails = ({
   marketData,
 }: DealTicketFeeDetailsProps) => {
   const feeDetails = useFeeDealTicketDetails(order, market, marketData);
-  const details = getFeeDetailsValues(feeDetails);
+  const details = useMemo(() => getFeeDetailsValues(feeDetails), [feeDetails]);
   return (
     <div>
       {details.map(({ label, value, labelDescription, symbol }) => (
diff --git a/libs/deal-ticket/src/components/deal-ticket/deal-ticket.tsx b/libs/deal-ticket/src/components/deal-ticket/deal-ticket.tsx
index a71611c53..e8fd0daf1 100644
--- a/libs/deal-ticket/src/components/deal-ticket/deal-ticket.tsx
+++ b/libs/deal-ticket/src/components/deal-ticket/deal-ticket.tsx
@@ -36,6 +36,7 @@ import {
   usePersistedOrderStore,
   usePersistedOrderStoreSubscription,
 } from '@vegaprotocol/orders';
+import { OrderType } from '@vegaprotocol/types';
 
 export type TransactionStatus = 'default' | 'pending';
 
@@ -82,7 +83,9 @@ export const DealTicket = ({
   const order = watch();
 
   watch((orderData) => {
-    setPersistedOrder(orderData as DealTicketFormFields);
+    if (orderData.type === OrderType.TYPE_LIMIT && orderData.price === '') {
+      setPersistedOrder(orderData as DealTicketFormFields);
+    }
   });
 
   usePersistedOrderStoreSubscription(market.id, (storedOrder) => {
@@ -369,7 +372,7 @@ const SummaryMessage = memo(
     if (balanceError) {
       return (
         <div className="mb-2">
-          <MarginWarning balance={balance} margin={margin} asset={asset} />;
+          <MarginWarning balance={balance} margin={margin} asset={asset} />
         </div>
       );
     }
diff --git a/libs/ui-toolkit/src/components/notification/notification.tsx b/libs/ui-toolkit/src/components/notification/notification.tsx
index 07bf8353b..c0beeefd3 100644
--- a/libs/ui-toolkit/src/components/notification/notification.tsx
+++ b/libs/ui-toolkit/src/components/notification/notification.tsx
@@ -82,7 +82,7 @@ export const Notification = ({
             {title}
           </div>
         )}
-        <div className="text-sm">{message}</div>
+        <div className="text-sm [word-break:break-word]">{message}</div>
         {buttonProps && (
           <Button
             size={buttonProps.size || 'sm'}