diff --git a/src/components/Instance/index.tsx b/src/components/Instance/index.tsx
index 80906e4a..85c6618d 100644
--- a/src/components/Instance/index.tsx
+++ b/src/components/Instance/index.tsx
@@ -52,7 +52,7 @@ const ComponentInstance: React.FC<Props> = ({
     !!domain.length &&
     !!errorCode &&
     !!(Linking.parse(`https://${domain}/`).hostname === domain) &&
-    errorCode === 401
+    (errorCode === 401 || errorCode === 500)
 
   const instanceQuery = useInstanceQuery({
     domain,
@@ -80,7 +80,7 @@ const ComponentInstance: React.FC<Props> = ({
         clientSecret,
         scopes: variables.scopes,
         redirectUri,
-        usePKCE: !['pawoo.net', 'mao.mastodonhub.com'].includes(domain)
+        usePKCE: !['pawoo.net'].includes(domain)
       })
       await request.makeAuthUrlAsync(discovery)
 
@@ -131,7 +131,8 @@ const ComponentInstance: React.FC<Props> = ({
             ((instanceQuery.data as Mastodon.Instance_V1)?.uri
               ? Linking.parse((instanceQuery.data as Mastodon.Instance_V1).uri).hostname
               : undefined) ||
-            (instanceQuery.data as Mastodon.Instance_V1)?.uri,
+            (instanceQuery.data as Mastodon.Instance_V1)?.uri ||
+            domain,
           'auth.account.avatar_static': avatar_static,
           version: instanceQuery.data?.version || '0',
           preferences: undefined,
diff --git a/src/utils/helpers/featureCheck.ts b/src/utils/helpers/featureCheck.ts
index 138fec0b..1b4cd56d 100644
--- a/src/utils/helpers/featureCheck.ts
+++ b/src/utils/helpers/featureCheck.ts
@@ -34,5 +34,7 @@ const features: { feature: Features; version: number }[] = [
 ]
 
 export const featureCheck = (feature: Features, v?: string): boolean =>
-  (features.find(f => f.feature === feature)?.version || 999) <=
-  parseFloat(v || getAccountStorage.string('version'))
+  v
+    ? (features.find(f => f.feature === feature)?.version || 999) <=
+      parseFloat(v || getAccountStorage.string('version'))
+    : false