diff --git a/packages/admin-ui/ui/src/components/molecules/timeline-events/order-edit/payment-required.tsx b/packages/admin-ui/ui/src/components/molecules/timeline-events/order-edit/payment-required.tsx
index 67130e0076..7864b3d24d 100644
--- a/packages/admin-ui/ui/src/components/molecules/timeline-events/order-edit/payment-required.tsx
+++ b/packages/admin-ui/ui/src/components/molecules/timeline-events/order-edit/payment-required.tsx
@@ -23,10 +23,7 @@ const PaymentRequired: React.FC<RequestedProps> = ({ event }) => {
   }
 
   const amount = requestedEditDifferenceDue
-    ? order.total +
-      order.refunded_total -
-      order.paid_total +
-      requestedEditDifferenceDue
+    ? order.total - order.paid_total + requestedEditDifferenceDue
     : order.refunded_total - order.paid_total
 
   if (amount <= 0) {
diff --git a/packages/admin-ui/ui/src/domain/orders/edit/modal.tsx b/packages/admin-ui/ui/src/domain/orders/edit/modal.tsx
index f7ddd456a8..a038f6eeb9 100644
--- a/packages/admin-ui/ui/src/domain/orders/edit/modal.tsx
+++ b/packages/admin-ui/ui/src/domain/orders/edit/modal.tsx
@@ -336,7 +336,10 @@ function OrderEditModal(props: OrderEditModalProps) {
               currencyCode={currencyCode}
               amountPaid={paidTotal - refundedTotal}
               newTotal={orderEdit.total}
-              differenceDue={orderEdit.total - paidTotal + refundedTotal}
+              differenceDue={
+                // TODO: more correct would be to have => diff_due = orderEdit_total_of_items_user_is_getting - paid_total + refunded_total
+                orderEdit.total - paidTotal // (orderEdit_total - refunded_total) - (paidTotal - refundedTotal)
+              }
             />
           )}
 
diff --git a/packages/admin-ui/ui/src/hooks/use-build-timeline.tsx b/packages/admin-ui/ui/src/hooks/use-build-timeline.tsx
index 4710a6215b..94ef922be9 100644
--- a/packages/admin-ui/ui/src/hooks/use-build-timeline.tsx
+++ b/packages/admin-ui/ui/src/hooks/use-build-timeline.tsx
@@ -345,7 +345,10 @@ export const useBuildTimeline = (orderId: string) => {
     for (const event of order.returns) {
       events.push({
         id: event.id,
-        items: event.items.map((i) => getReturnItems(allItems, i)),
+        items: event.items
+          .map((i) => getReturnItems(allItems, i))
+          // After order edit is confirmed, line item that was returned can be deleted
+          .filter((i) => !!i),
         status: event.status,
         currentStatus: event.status,
         time: event.updated_at,
@@ -360,7 +363,10 @@ export const useBuildTimeline = (orderId: string) => {
       if (event.status !== "requested") {
         events.push({
           id: event.id,
-          items: event.items.map((i) => getReturnItems(allItems, i)),
+          items: event.items
+            .map((i) => getReturnItems(allItems, i))
+            // After order edit is confirmed, line item that was returned can be deleted
+            .filter((i) => !!i),
           status: "requested",
           time: event.created_at,
           type: "return",