diff --git a/src/App.js b/src/App.js
index 9a8e0bb..cc435aa 100644
--- a/src/App.js
+++ b/src/App.js
@@ -1692,7 +1692,7 @@ function InitiativeControls({ campaignId, encounter, encounterPath }) {
       logAction(`Combat ${newPausedState ? 'paused' : 'resumed'}: "${encounter.name}"`, { encounterName: encounter.name }, {
         encounterPath,
         updates: {
-          isPaused: encounter.isPaused,
+          isPaused: encounter.isPaused ?? false,
           turnOrderIds: [...(encounter.turnOrderIds || [])],
         },
       });
@@ -1789,10 +1789,10 @@ function InitiativeControls({ campaignId, encounter, encounterPath }) {
       logAction(`Combat ended: "${encounter.name}"`, { encounterName: encounter.name }, {
         encounterPath,
         updates: {
-          isStarted: encounter.isStarted,
-          isPaused: encounter.isPaused,
-          round: encounter.round,
-          currentTurnParticipantId: encounter.currentTurnParticipantId,
+          isStarted: encounter.isStarted ?? false,
+          isPaused: encounter.isPaused ?? false,
+          round: encounter.round ?? 0,
+          currentTurnParticipantId: encounter.currentTurnParticipantId ?? null,
           turnOrderIds: [...(encounter.turnOrderIds || [])],
         },
       });