diff --git a/Mage.Client/src/main/java/mage/client/combat/CombatManager.java b/Mage.Client/src/main/java/mage/client/combat/CombatManager.java
index 695a507133d..b9be142a832 100644
--- a/Mage.Client/src/main/java/mage/client/combat/CombatManager.java
+++ b/Mage.Client/src/main/java/mage/client/combat/CombatManager.java
@@ -19,20 +19,14 @@ import java.util.UUID;
 /**
  * @author noxx
  */
-public class CombatManager {
+public enum CombatManager {
 
-    private static CombatManager combatManager;
 
+    instance;
     private final Map<UUID, Integer> combatAttackers = new HashMap<>();
     private final Map<UUID, Integer> combatBlockers = new HashMap<>();
     private int globalBlockersCount; // we need global counter as there are several combat groups
 
-    public static CombatManager getInstance() {
-        if (combatManager == null) {
-            combatManager = new CombatManager();
-        }
-        return combatManager;
-    }
 
     private Point parentPoint;
 
diff --git a/Mage.Client/src/main/java/mage/client/game/GamePanel.java b/Mage.Client/src/main/java/mage/client/game/GamePanel.java
index 2cb9a387652..9b61573a4c8 100644
--- a/Mage.Client/src/main/java/mage/client/game/GamePanel.java
+++ b/Mage.Client/src/main/java/mage/client/game/GamePanel.java
@@ -860,9 +860,9 @@ public final class GamePanel extends javax.swing.JPanel {
         showRevealed(game);
         showLookedAt(game);
         if (!game.getCombat().isEmpty()) {
-            CombatManager.getInstance().showCombat(game.getCombat(), gameId);
+            CombatManager.instance.showCombat(game.getCombat(), gameId);
         } else {
-            CombatManager.getInstance().hideCombat(gameId);
+            CombatManager.instance.hideCombat(gameId);
         }
 
         for (PlayerView player : game.getPlayers()) {