diff --git a/src/components/common/BlockchainInfo.tsx b/src/components/common/BlockchainInfo.tsx
index b044f6de..438112cf 100644
--- a/src/components/common/BlockchainInfo.tsx
+++ b/src/components/common/BlockchainInfo.tsx
@@ -8,7 +8,7 @@ import { toIPFS, toGateway } from "~/lib/ipfs-parser"
 import { IPFS_SW_GATEWAY_PREFIX } from "~/lib/ipfs-gateway"
 
 export const BlockchainInfo: React.FC<{
-  site?: Profile
+  site?: Profile | null
   page?: Note | null
 }> = ({ site, page }) => {
   return (
diff --git a/src/components/site/SiteFooter.tsx b/src/components/site/SiteFooter.tsx
index 1b330035..1ef33985 100644
--- a/src/components/site/SiteFooter.tsx
+++ b/src/components/site/SiteFooter.tsx
@@ -5,7 +5,7 @@ import Script from "next/script"
 import Image from "next/image"
 
 export const SiteFooter: React.FC<{
-  site?: Profile
+  site?: Profile | null
   page?: Note | null
 }> = ({ site, page }) => {
   return (
diff --git a/src/components/site/SiteHeader.tsx b/src/components/site/SiteHeader.tsx
index b08f78bc..b9d6a6d3 100644
--- a/src/components/site/SiteHeader.tsx
+++ b/src/components/site/SiteHeader.tsx
@@ -53,7 +53,7 @@ const HeaderLink: React.FC<{ link: HeaderLinkType }> = ({ link }) => {
 }
 
 export const SiteHeader: React.FC<{
-  site?: Profile | undefined
+  site?: Profile | undefined | null
   subscriptions?: Links | null
 }> = ({ site, subscriptions }) => {
   const { address } = useAccount()
diff --git a/src/pages/dashboard/[subdomain]/settings/css.tsx b/src/pages/dashboard/[subdomain]/settings/css.tsx
index 81882871..4d22fffe 100644
--- a/src/pages/dashboard/[subdomain]/settings/css.tsx
+++ b/src/pages/dashboard/[subdomain]/settings/css.tsx
@@ -39,11 +39,11 @@ export default function SettingsDomainsPage() {
 
   const [hasSet, setHasSet] = useState(false)
   useEffect(() => {
-    if (site.isSuccess && site.data && !css && !hasSet && subdomain) {
+    if (site.isSuccess && site.data && !css && !hasSet) {
       setCss(site.data.css || "")
       setHasSet(true)
     }
-  }, [site.data, site.isSuccess, css, hasSet, subdomain])
+  }, [site.data, site.isSuccess, css, hasSet])
 
   const title = "Site Settings"
   return (
diff --git a/src/pages/dashboard/[subdomain]/settings/navigation.tsx b/src/pages/dashboard/[subdomain]/settings/navigation.tsx
index 519eb019..cc10baa2 100644
--- a/src/pages/dashboard/[subdomain]/settings/navigation.tsx
+++ b/src/pages/dashboard/[subdomain]/settings/navigation.tsx
@@ -77,7 +77,7 @@ export default function SiteSettingsNavigationPage() {
 
   const itemsModified = useMemo(() => {
     if (!site.isSuccess) return false
-    return !equal(items, site.data.navigation)
+    return !equal(items, site.data?.navigation)
   }, [items, site.data, site.isSuccess])
 
   const updateItem: UpdateItem = (id, newItem) => {
diff --git a/src/queries/site.ts b/src/queries/site.ts
index a93cef8d..494330c4 100644
--- a/src/queries/site.ts
+++ b/src/queries/site.ts
@@ -15,6 +15,9 @@ export const useGetUserSites = (address?: string) => {
 export const useGetSite = (input: string) => {
   const unidata = useUnidata()
   return useQuery(["getSite", input], async () => {
+    if (!input) {
+      return null
+    }
     return siteModel.getSite(input, unidata)
   })
 }