diff --git a/src/browser/modules/DBMSInfo/DatabaseSelector.tsx b/src/browser/modules/DBMSInfo/DatabaseSelector.tsx
index 73a73a67d50..fabb4779abb 100644
--- a/src/browser/modules/DBMSInfo/DatabaseSelector.tsx
+++ b/src/browser/modules/DBMSInfo/DatabaseSelector.tsx
@@ -38,6 +38,7 @@ const Select = styled.select`
 const EMPTY_OPTION = 'Select db to use'
 
 const HOUSE_EMOJI = '\u{1F3E0}'
+const HOUR_GLASS_EMOJI = '\u{231B}'
 const NBSP_CHAR = '\u{00A0}'
 
 type DatabaseSelectorProps = {
@@ -82,9 +83,14 @@ export const DatabaseSelector = ({
         >
           {uniqDatabases.map(db => {
             return (
-              <option key={db.name} value={db.name}>
+              <option
+                key={db.name}
+                value={db.name}
+                disabled={db.status === 'unknown'}
+              >
                 {db.name}
                 {db === homeDb ? NBSP_CHAR + HOUSE_EMOJI : ''}
+                {db.status === 'unknown' ? NBSP_CHAR + HOUR_GLASS_EMOJI : ''}
               </option>
             )
           })}
diff --git a/src/shared/services/exceptions.ts b/src/shared/services/exceptions.ts
index cbd401fd05f..6236c91c854 100644
--- a/src/shared/services/exceptions.ts
+++ b/src/shared/services/exceptions.ts
@@ -136,7 +136,7 @@ export function DatabaseUnavailableError({
   dbName: string
   dbMeta: { status: string }
 }): BrowserError {
-  const type = 'DatabaseNotFoundError'
+  const type = 'DatabaseUnavailableError'
   return {
     type,
     code: type,