diff --git a/src/Util/TopicManager.php b/src/Util/TopicManager.php
index 2ff1baa..7f1f821 100644
--- a/src/Util/TopicManager.php
+++ b/src/Util/TopicManager.php
@@ -610,8 +610,13 @@ readonly class TopicManager implements TopicManagerInterface
 
             $playedGame->setRedPoints($redPoints);
             $playedGame->setBluePoints($bluePoints);
-            $playedGame->setRedExplodedBomb((bool)$event['bomb'] && 'red' === $player ? true : null);
-            $playedGame->setBlueExplodedBomb((bool)$event['bomb'] && 'blue' === $player ? true : null);
+            if ((bool)$event['bomb']) {
+                if ('red' === $player) {
+                    $playedGame->setRedExplodedBomb(true);
+                } elseif ('blue' === $player) {
+                    $playedGame->setBlueExplodedBomb(true);
+                }
+            }
             $playedGame->setUpdated(new DateTime());
 
             /** Bonus data is already persisted in calculateBonuses, but we ensure it's up to date */
diff --git a/templates/Game/battle_share.html.twig b/templates/Game/battle_share.html.twig
index 32008b8..72b43db 100644
--- a/templates/Game/battle_share.html.twig
+++ b/templates/Game/battle_share.html.twig
@@ -127,7 +127,6 @@
       {% endif %}
       {% set pointDiff = (redPts|default(0) - bluePts|default(0))|abs %}
       {% set winnerName = redPts|default(0) > bluePts|default(0) ? redName : (bluePts|default(0) > redPts|default(0) ? blueName : null) %}
-
       <div class="bshare-details">
         {% if resign %}
           <div class="bshare-detail">
@@ -166,8 +165,6 @@
           </div>
         {% endif %}
       </div>
-
-      {# Bonus Stats Section #}
       {% set hasRedStats = redBonusStats is not empty and (redBonusStats.blindHits or redBonusStats.chainBest or redBonusStats.edgeMines or redBonusStats.lastMineHits or redBonusStats.biggestReveal) %}
       {% set hasBlueStats = blueBonusStats is not empty and (blueBonusStats.blindHits or blueBonusStats.chainBest or blueBonusStats.edgeMines or blueBonusStats.lastMineHits or blueBonusStats.biggestReveal) %}
       {% if redBonusPoints > 0 or blueBonusPoints > 0 or hasRedStats or hasBlueStats %}
@@ -220,8 +217,6 @@
               {% endif %}
             </div>
           </div>
-
-          {# Blue Bonus #}
           <div class="bshare-bonus__player bshare-bonus__player--blue">
             <div class="bshare-bonus__header">
               <span class="bshare-bonus__points">{{ blueBonusPoints|number_format(1, '.', '') }}</span>