diff --git a/frontend/src/resources/alerter/index.tsx b/frontend/src/resources/alerter/index.tsx
index 56632b711..45ed255d7 100644
--- a/frontend/src/resources/alerter/index.tsx
+++ b/frontend/src/resources/alerter/index.tsx
@@ -93,8 +93,8 @@ export const AlerterConfig = ({ id }: { id: string }) => {
 
 export const AlerterPage = () => {
   const id = useParams().alerterId;
-  if (!id) return null;
   useAddRecentlyViewed("Alerter", id);
+  if (!id) return null;
 
   return (
     <Resource
diff --git a/frontend/src/resources/build/index.tsx b/frontend/src/resources/build/index.tsx
index fe32d3069..dec9d10ab 100644
--- a/frontend/src/resources/build/index.tsx
+++ b/frontend/src/resources/build/index.tsx
@@ -31,8 +31,8 @@ export const BuildCard = ({ id }: { id: string }) => {
 
 export const BuildPage = () => {
   const id = useParams().buildId;
-  if (!id) return null;
   useAddRecentlyViewed("Build", id);
+  if (!id) return null;
 
   return (
     <Resource
diff --git a/frontend/src/resources/builder/index.tsx b/frontend/src/resources/builder/index.tsx
index da867eb1f..e50e3d698 100644
--- a/frontend/src/resources/builder/index.tsx
+++ b/frontend/src/resources/builder/index.tsx
@@ -40,9 +40,8 @@ export const BuilderCard = ({ id }: { id: string }) => {
 
 export const BuilderPage = () => {
   const id = useParams().builderId;
-
-  if (!id) return null;
   useAddRecentlyViewed("Builder", id);
+  if (!id) return null;
 
   return (
     <Resource title={<BuilderName id={id} />} info={<></>} actions={<></>}>
diff --git a/frontend/src/resources/deployment/index.tsx b/frontend/src/resources/deployment/index.tsx
index 8f9aa33f0..22ab2c37e 100644
--- a/frontend/src/resources/deployment/index.tsx
+++ b/frontend/src/resources/deployment/index.tsx
@@ -37,8 +37,8 @@ export const DeploymentCard = ({ id }: { id: string }) => {
 
 export const DeploymentPage = () => {
   const id = useParams().deploymentId;
-  if (!id) return null;
   useAddRecentlyViewed("Deployment", id);
+  if (!id) return null;
 
   return (
     <Resource
diff --git a/frontend/src/resources/repo/index.tsx b/frontend/src/resources/repo/index.tsx
index 0441ed0a6..a8a021e5f 100644
--- a/frontend/src/resources/repo/index.tsx
+++ b/frontend/src/resources/repo/index.tsx
@@ -14,8 +14,8 @@ export const RepoName = ({ id }: { id: string }) => {
 
 export const RepoPage = () => {
   const id = useParams().repoId;
-  if (!id) return null;
   useAddRecentlyViewed("Repo", id);
+  if (!id) return null;
 
   return (
     <Page title="Repo" subtitle="" actions="">
diff --git a/frontend/src/resources/server/index.tsx b/frontend/src/resources/server/index.tsx
index f088fcd1e..b610267ee 100644
--- a/frontend/src/resources/server/index.tsx
+++ b/frontend/src/resources/server/index.tsx
@@ -72,9 +72,8 @@ const ServerConfig = ({ id }: { id: string }) => {
 
 export const ServerPage = () => {
   const id = useParams().serverId;
-
-  if (!id) return null;
   useAddRecentlyViewed("Server", id);
+  if (!id) return null;
 
   return (
     <Resource