diff --git a/Mage.Sets/src/mage/cards/g/GoldnightCastigator.java b/Mage.Sets/src/mage/cards/g/GoldnightCastigator.java
index 9411b61bbfd..b461de60e8e 100644
--- a/Mage.Sets/src/mage/cards/g/GoldnightCastigator.java
+++ b/Mage.Sets/src/mage/cards/g/GoldnightCastigator.java
@@ -118,14 +118,14 @@ class GoldnightCastigatorDoubleDamageEffect extends ReplacementEffectImpl {
         switch (event.getType()) {
             case DAMAGE_PLAYER:
                 if (event.getTargetId().equals(source.getControllerId())) {
-                    event.setAmount(event.getAmount() * 2);
+                    event.setAmount(game.addWithOverflowCheck(event.getAmount(), event.getAmount()));
                 }
                 break;
             case DAMAGE_CREATURE:
                 Permanent permanent = game.getPermanent(event.getTargetId());
                 if (permanent != null) {
                     if (permanent.getId().equals(source.getSourceId())) {
-                        event.setAmount(event.getAmount() * 2);
+                        event.setAmount(game.addWithOverflowCheck(event.getAmount(), event.getAmount()));
                     }
                 }
         }