diff --git a/indexer/services/ender/__tests__/handlers/order-fills/liquidation-handler.test.ts b/indexer/services/ender/__tests__/handlers/order-fills/liquidation-handler.test.ts
index 0c468398eb..c10bb31647 100644
--- a/indexer/services/ender/__tests__/handlers/order-fills/liquidation-handler.test.ts
+++ b/indexer/services/ender/__tests__/handlers/order-fills/liquidation-handler.test.ts
@@ -132,7 +132,7 @@ describe('LiquidationHandler', () => {
     perpetualId: testConstants.defaultPerpetualMarket.id,
     side: PositionSide.LONG,
     status: PerpetualPositionStatus.OPEN,
-    size: '10',
+    size: '5',
     maxSize: '25',
     sumOpen: '10',
     entryPrice: '15000',
@@ -385,7 +385,7 @@ describe('LiquidationHandler', () => {
             defaultPerpetualPosition.openEventId,
           ),
           {
-            sumOpen: Big(defaultPerpetualPosition.size).plus(totalFilled).toFixed(),
+            sumOpen: Big(defaultPerpetualPosition.sumOpen!).plus(totalFilled).toFixed(),
             entryPrice: getWeightedAverage(
               defaultPerpetualPosition.entryPrice!,
               defaultPerpetualPosition.size,
diff --git a/indexer/services/ender/__tests__/handlers/order-fills/order-handler.test.ts b/indexer/services/ender/__tests__/handlers/order-fills/order-handler.test.ts
index 46b005c841..e8e4ff8b9b 100644
--- a/indexer/services/ender/__tests__/handlers/order-fills/order-handler.test.ts
+++ b/indexer/services/ender/__tests__/handlers/order-fills/order-handler.test.ts
@@ -133,7 +133,7 @@ describe('OrderHandler', () => {
     perpetualId: testConstants.defaultPerpetualMarket.id,
     side: PositionSide.LONG,
     status: PerpetualPositionStatus.OPEN,
-    size: '10',
+    size: '5',
     maxSize: '25',
     sumOpen: '10',
     entryPrice: '15000',
@@ -207,6 +207,7 @@ describe('OrderHandler', () => {
       {
         goodTilBlock: 15,
       },
+      false,
     ],
     [
       'goodTilBlockTime',
@@ -216,6 +217,17 @@ describe('OrderHandler', () => {
       {
         goodTilBlockTime: 1_000_005_000,
       },
+      false,
+    ],
+    [
+      'goodTilBlock',
+      {
+        goodTilBlock: 10,
+      },
+      {
+        goodTilBlock: 15,
+      },
+      true,
     ],
   ])(
     'creates fills and orders (with %s), sends vulcan messages for order updates and order ' +
@@ -224,6 +236,7 @@ describe('OrderHandler', () => {
       _name: string,
       makerGoodTilOneof: Partial<IndexerOrder>,
       takerGoodTilOneof: Partial<IndexerOrder>,
+      useNegativeSize: boolean,
     ) => {
       const transactionIndex: number = 0;
       const eventIndex: number = 0;
@@ -279,7 +292,10 @@ describe('OrderHandler', () => {
 
       // create PerpetualPositions
       await Promise.all([
-        PerpetualPositionTable.create(defaultPerpetualPosition),
+        PerpetualPositionTable.create({
+          ...defaultPerpetualPosition,
+          size: useNegativeSize ? '-5' : defaultPerpetualPosition.size,
+        }),
         PerpetualPositionTable.create({
           ...defaultPerpetualPosition,
           subaccountId: testConstants.defaultSubaccountId2,
@@ -432,7 +448,7 @@ describe('OrderHandler', () => {
             defaultPerpetualPosition.openEventId,
           ),
           {
-            sumOpen: Big(defaultPerpetualPosition.size).plus(totalFilled).toFixed(),
+            sumOpen: Big(defaultPerpetualPosition.sumOpen!).plus(totalFilled).toFixed(),
             entryPrice: getWeightedAverage(
               defaultPerpetualPosition.entryPrice!,
               defaultPerpetualPosition.size,
diff --git a/indexer/services/ender/src/scripts/helpers/dydx_liquidation_fill_handler_per_order.sql b/indexer/services/ender/src/scripts/helpers/dydx_liquidation_fill_handler_per_order.sql
index 318d598db0..ca2856dfc4 100644
--- a/indexer/services/ender/src/scripts/helpers/dydx_liquidation_fill_handler_per_order.sql
+++ b/indexer/services/ender/src/scripts/helpers/dydx_liquidation_fill_handler_per_order.sql
@@ -196,7 +196,7 @@ BEGIN
                 perpetual_position_record."side", order_side) THEN
             sum_open = dydx_trim_scale(perpetual_position_record."sumOpen" + fill_amount);
             entry_price = dydx_get_weighted_average(
-                    perpetual_position_record."entryPrice", perpetual_position_record."sumOpen",
+                    perpetual_position_record."entryPrice", ABS(perpetual_position_record."size"),
                     maker_price, fill_amount);
             perpetual_position_record."sumOpen" = sum_open;
             perpetual_position_record."entryPrice" = entry_price;
diff --git a/indexer/services/ender/src/scripts/helpers/dydx_update_perpetual_position_aggregate_fields.sql b/indexer/services/ender/src/scripts/helpers/dydx_update_perpetual_position_aggregate_fields.sql
index d021eecf28..f6e269a0b1 100644
--- a/indexer/services/ender/src/scripts/helpers/dydx_update_perpetual_position_aggregate_fields.sql
+++ b/indexer/services/ender/src/scripts/helpers/dydx_update_perpetual_position_aggregate_fields.sql
@@ -44,7 +44,7 @@ BEGIN
     IF dydx_perpetual_position_and_order_side_matching(perpetual_position_record."side", side) THEN
         sum_open := dydx_trim_scale(perpetual_position_record."sumOpen" + size);
         entry_price := dydx_get_weighted_average(
-            perpetual_position_record."entryPrice", perpetual_position_record."sumOpen", price, size
+            perpetual_position_record."entryPrice", ABS(perpetual_position_record."size"), price, size
         );
         perpetual_position_record."sumOpen" = sum_open;
         perpetual_position_record."entryPrice" = entry_price;