diff --git a/.changeset/soft-jokes-move.md b/.changeset/soft-jokes-move.md
new file mode 100644
index 0000000..d60035b
--- /dev/null
+++ b/.changeset/soft-jokes-move.md
@@ -0,0 +1,5 @@
+---
+'overlay-kit': patch
+---
+
+Set current to null if no overlay remains on unmount
diff --git a/packages/src/context/reducer.ts b/packages/src/context/reducer.ts
index 2831cb2..9bdcc90 100644
--- a/packages/src/context/reducer.ts
+++ b/packages/src/context/reducer.ts
@@ -54,7 +54,7 @@ export function overlayReducer(state: OverlayData, action: OverlayReducerAction)
       delete copiedOverlayData[action.overlayId];
 
       return {
-        current: remainingOverlays.at(-1) || state.current,
+        current: remainingOverlays.at(-1) ?? null,
         overlayOrderList: remainingOverlays,
         overlayData: copiedOverlayData,
       };
@@ -75,7 +75,7 @@ export function overlayReducer(state: OverlayData, action: OverlayReducerAction)
       };
     }
     case 'REMOVE_ALL': {
-      return { current: state.current, overlayOrderList: [], overlayData: {} };
+      return { current: null, overlayOrderList: [], overlayData: {} };
     }
   }
 }