diff --git a/apps/web/src/App.tsx b/apps/web/src/App.tsx
index c459719..25ef71d 100644
--- a/apps/web/src/App.tsx
+++ b/apps/web/src/App.tsx
@@ -76,6 +76,9 @@ function useActionBarAnimation(combatantCount: number) {
 export function App() {
 	const {
 		encounter,
+		isEmpty,
+		hasCreatureCombatants,
+		canRollAllInitiative,
 		advanceTurn,
 		retreatTurn,
 		addCombatant,
@@ -211,14 +214,6 @@ export function App() {
 		sidePanel.showCreature,
 	]);
 
-	const isEmpty = encounter.combatants.length === 0;
-	const hasCreatureCombatants = encounter.combatants.some(
-		(c) => c.creatureId != null,
-	);
-	const canRollAllInitiative = encounter.combatants.some(
-		(c) => c.creatureId != null && c.initiative == null,
-	);
-
 	return (
 		<div className="flex h-screen flex-col">
 			<div className="relative mx-auto flex w-full max-w-2xl flex-1 flex-col gap-3 px-4 min-h-0">
diff --git a/apps/web/src/hooks/use-encounter.ts b/apps/web/src/hooks/use-encounter.ts
index 37a307a..9c077dc 100644
--- a/apps/web/src/hooks/use-encounter.ts
+++ b/apps/web/src/hooks/use-encounter.ts
@@ -371,9 +371,20 @@ export function useEncounter() {
 		[makeStore, editCombatant],
 	);
 
+	const isEmpty = encounter.combatants.length === 0;
+	const hasCreatureCombatants = encounter.combatants.some(
+		(c) => c.creatureId != null,
+	);
+	const canRollAllInitiative = encounter.combatants.some(
+		(c) => c.creatureId != null && c.initiative == null,
+	);
+
 	return {
 		encounter,
 		events,
+		isEmpty,
+		hasCreatureCombatants,
+		canRollAllInitiative,
 		advanceTurn,
 		retreatTurn,
 		addCombatant,