frontend/src/pages/wiki/WikiDetailPage.tsx

@@ -39,12 +39,18 @@ export default () => {
       enabled:  Boolean (title) && !(/^\d+$/.test (title)),
       queryKey: wikiKeys.show (title ?? '', version ? { version } : { }),
       queryFn:  () => fetchWikiPageByTitle (title ?? '', version ? { version } : { }) })
-  if (wikiPage)
+
-    {
+  useEffect (() => {
-      if (wikiPage.title !== title)
+    if (!(wikiPage))
-	navigate (`/wiki/${ encodeURIComponent(wikiPage.title) }`, { replace: true })
+      return
-      WikiIdBus.set (wikiPage.id)
+
-    }
+    WikiIdBus.set (wikiPage.id)
+
+    if (wikiPage.title !== title)
+      navigate (`/wiki/${ encodeURIComponent(wikiPage.title) }`, { replace: true })
+
+    return () => WikiIdBus.set (null)
+  }, [wikiPage, title, navigate])
 
   useEffect (() => {
     if (/^\d+$/.test (title))
@@ -89,7 +95,7 @@ export default () => {
     }) ()
 
     return () => WikiIdBus.set (null)
-  }, [title, location.search])
+  }, [title, version])
 
   return (
       <MainArea>