diff --git a/forge-game/src/main/java/forge/game/ability/effects/LifeExchangeEffect.java b/forge-game/src/main/java/forge/game/ability/effects/LifeExchangeEffect.java
index c179f83b10d..3c4bcfd5c08 100644
--- a/forge-game/src/main/java/forge/game/ability/effects/LifeExchangeEffect.java
+++ b/forge-game/src/main/java/forge/game/ability/effects/LifeExchangeEffect.java
@@ -54,33 +54,29 @@ public class LifeExchangeEffect extends SpellAbilityEffect {
 
         final int life1 = p1.getLife();
         final int life2 = p2.getLife();
+        final int diff = Math.abs(life1 - life2);
 
-        if (sa.hasParam("RememberDifference")) {
-            final int diff = life1 - life2;
-            source.addRemembered(diff);
+        if (life2 > life1) {
+            // swap players
+            Player tmp = p2;
+            p2 = p1;
+            p1 = tmp;
         }
-
-        final Map<Player, Integer> lossMap = Maps.newHashMap();
-        if ((life1 > life2) && p1.canLoseLife() && p2.canGainLife()) {
-            final int diff = life1 - life2;
+        if (diff > 0 && p1.canLoseLife() && p2.canGainLife()) {
             final int lost = p1.loseLife(diff, false, false);
             p2.gainLife(diff, source, sa);
             if (lost > 0) {
+                final Map<Player, Integer> lossMap = Maps.newHashMap();
                 lossMap.put(p1, lost);
+                final Map<AbilityKey, Object> runParams = AbilityKey.mapFromPIMap(lossMap);
+                source.getGame().getTriggerHandler().runTrigger(TriggerType.LifeLostAll, runParams, false);
+                if (sa.hasParam("RememberOwnLoss") && p1.equals(sa.getActivatingPlayer())) {
+                    source.addRemembered(lost);
+                }
             }
-        } else if ((life2 > life1) && p2.canLoseLife() && p1.canGainLife()) {
-            final int diff = life2 - life1;
-            final int lost = p2.loseLife(diff, false, false);
-            p1.gainLife(diff, source, sa);
-            if (lost > 0) {
-                lossMap.put(p2, lost);
-            }
-        } else {
-            // they are equal or can't be exchanged, so nothing to do
         }
-        if (!lossMap.isEmpty()) { // Run triggers if any player actually lost life
-            final Map<AbilityKey, Object> runParams = AbilityKey.mapFromPIMap(lossMap);
-            source.getGame().getTriggerHandler().runTrigger(TriggerType.LifeLostAll, runParams, false);
+        if (sa.hasParam("RememberDifference")) {
+            source.addRemembered(p1.getLife() - p2.getLife());
         }
     }
 }
diff --git a/forge-game/src/main/java/forge/game/player/Player.java b/forge-game/src/main/java/forge/game/player/Player.java
index 9ff13e7ecf7..c6696a37733 100644
--- a/forge-game/src/main/java/forge/game/player/Player.java
+++ b/forge-game/src/main/java/forge/game/player/Player.java
@@ -455,7 +455,6 @@ public class Player extends GameEntity implements Comparable<Player> {
             return false;
         }
 
-        // Run any applicable replacement effects.
         final Map<AbilityKey, Object> repParams = AbilityKey.mapFromAffected(this);
         repParams.put(AbilityKey.LifeGained, lifeGain);
         repParams.put(AbilityKey.SourceSA, sa);
@@ -521,7 +520,7 @@ public class Player extends GameEntity implements Comparable<Player> {
             return 0;
         }
         int oldLife = life;
-        // Run applicable replacement effects
+
         final Map<AbilityKey, Object> repParams = AbilityKey.mapFromAffected(this);
         repParams.put(AbilityKey.Amount, toLose);
         repParams.put(AbilityKey.IsDamage, damage);
@@ -554,7 +553,6 @@ public class Player extends GameEntity implements Comparable<Player> {
         }
 
         boolean firstLost = lifeLostThisTurn == 0;
-
         lifeLostThisTurn += toLose;
 
         final Map<AbilityKey, Object> runParams = AbilityKey.mapFromPlayer(this);