From 99a599890588247fb3a4381d997bc9ebaa993ae1 Mon Sep 17 00:00:00 2001
From: Matt Brophy <matt@brophy.org>
Date: Fri, 3 Feb 2023 16:46:42 -0500
Subject: [PATCH] Fix useBlocker to return IDLE_BLOCKER during SSR

---
 .changeset/long-jokes-wait.md        | 5 +++++
 packages/react-router-dom/server.tsx | 3 ++-
 2 files changed, 7 insertions(+), 1 deletion(-)
 create mode 100644 .changeset/long-jokes-wait.md

diff --git a/.changeset/long-jokes-wait.md b/.changeset/long-jokes-wait.md
new file mode 100644
index 0000000000..4c85a2bb63
--- /dev/null
+++ b/.changeset/long-jokes-wait.md
@@ -0,0 +1,5 @@
+---
+"react-router-dom": patch
+---
+
+Fix useBlocker to return IDLE_BLOCKER during SSR
diff --git a/packages/react-router-dom/server.tsx b/packages/react-router-dom/server.tsx
index 3ace651b43..6e9c6cd365 100644
--- a/packages/react-router-dom/server.tsx
+++ b/packages/react-router-dom/server.tsx
@@ -7,6 +7,7 @@ import type {
   StaticHandlerContext,
 } from "@remix-run/router";
 import {
+  IDLE_BLOCKER,
   IDLE_FETCHER,
   IDLE_NAVIGATION,
   Action,
@@ -299,7 +300,7 @@ export function createStaticRouter(
       throw msg("dispose");
     },
     getBlocker() {
-      throw msg("getBlocker");
+      return IDLE_BLOCKER;
     },
     deleteBlocker() {
       throw msg("deleteBlocker");