diff --git a/forge-gui-mobile/src/forge/adventure/scene/DuelScene.java b/forge-gui-mobile/src/forge/adventure/scene/DuelScene.java
index 20f2b698cd9..b288d94b93e 100644
--- a/forge-gui-mobile/src/forge/adventure/scene/DuelScene.java
+++ b/forge-gui-mobile/src/forge/adventure/scene/DuelScene.java
@@ -59,6 +59,7 @@ public class DuelScene extends ForgeScene {
             @Override
             public void run() {
                 SoundSystem.instance.setBackgroundMusic(MusicPlaylist.MENUS); //start background music
+                dungeonEffect = null;
                 Scene last = Forge.switchToLast();
 
                 if (last instanceof HudScene) {
@@ -142,11 +143,11 @@ public class DuelScene extends ForgeScene {
         //Collect and add enemy effects (same as blessings but for individual enemies).
 
         //Collect and add dungeon-wide effects.
-        if(dungeonEffect != null)
+        if(dungeonEffect != null) {
             oppEffects.add(dungeonEffect);
-            if(dungeonEffect.opponent != null)
+            if (dungeonEffect.opponent != null)
                 playerEffects.add(dungeonEffect.opponent);
-
+        }
 
         addEffects(humanPlayer,playerEffects);
         addEffects(aiPlayer,oppEffects);
diff --git a/forge-gui-mobile/src/forge/adventure/stage/MapStage.java b/forge-gui-mobile/src/forge/adventure/stage/MapStage.java
index 7ec1259092b..cc95a55f44a 100644
--- a/forge-gui-mobile/src/forge/adventure/stage/MapStage.java
+++ b/forge-gui-mobile/src/forge/adventure/stage/MapStage.java
@@ -72,8 +72,10 @@ public class MapStage extends GameStage {
     public Dialog getDialog() {
         return dialog;
     }
+
     public void clearIsInMap() {
         isInMap = false;
+        effect = null;
         GameHUD.getInstance().showHideMap(true);
     }
     public void draw (Batch batch) {
@@ -82,9 +84,7 @@ public class MapStage extends GameStage {
         //update camera after all layers got drawn
 
         if (!getRoot().isVisible()) return;
-
         getRoot().draw(batch, 1);
-
     }
 
     public MapLayer getSpriteLayer() {
@@ -186,7 +186,7 @@ public class MapStage extends GameStage {
         String text = "Strange magical energies flow within this place...\nAll opponents get:\n";
         text += E.getDescription();
         dialog.text(text);
-        dialog.getButtonTable().add(Controls.newTextButton("OK", () -> { this.hideDialog(); }));
+        dialog.getButtonTable().add(Controls.newTextButton("OK", this::hideDialog));
         dialog.setKeepWithinStage(true);
         showDialog();
     }
@@ -334,7 +334,7 @@ public class MapStage extends GameStage {
                             continue;
 
                         ShopData data = shops.get(WorldSave.getCurrentSave().getWorld().getRandom().nextInt(shops.size));
-                        Array<Reward> ret = new Array<Reward>();
+                        Array<Reward> ret = new Array<>();
                         for (RewardData rdata : new Array.ArrayIterator<>(data.rewards)) {
                             ret.addAll(rdata.generate(false));
                         }
@@ -417,7 +417,7 @@ public class MapStage extends GameStage {
 
     public EnemySprite getEnemyByID(int id) {
         for(MapActor A : new Array.ArrayIterator<>(actors)){
-            if(A instanceof EnemySprite && ((EnemySprite) A).getId() == id)
+            if(A instanceof EnemySprite && A.getId() == id)
                 return ((EnemySprite) A);
         }
         return null;
@@ -448,11 +448,10 @@ public class MapStage extends GameStage {
                         resetPosition();
                         showDialog();
                         mob.dialog.activate();
-                        break;
                     } else { //Duel the enemy.
                         beginDuel(mob);
-                        break;
                     }
+                    break;
                 } else if (actor instanceof RewardSprite) {
                     Gdx.input.vibrate(50);
                     startPause(0.1f, new Runnable() {
@@ -495,7 +494,7 @@ public class MapStage extends GameStage {
                 DuelScene S = ((DuelScene) SceneType.DuelScene.instance);
                 S.setEnemy(mob);
                 S.setPlayer(player);
-                S.setDungeonEffect(effect);
+                if(isInMap && effect != null) S.setDungeonEffect(effect);
                 Forge.switchScene(SceneType.DuelScene.instance);
             }
         });