diff --git a/src/components/App.tsx b/src/components/App.tsx
index 352e28f466..a59e38901c 100644
--- a/src/components/App.tsx
+++ b/src/components/App.tsx
@@ -234,7 +234,10 @@ const App = () => {
             id: team.id,
             name: team.name,
             domain: team.domain,
-            iconUrl: team.iconUrl,
+            iconUrl:
+              team.icon != null
+                ? getBoostHubTeamIconUrl(team.icon.location)
+                : undefined,
           }
         }),
       })
diff --git a/src/components/organisms/BoostHubSignInForm.tsx b/src/components/organisms/BoostHubSignInForm.tsx
index ede9e240e7..ab709db187 100644
--- a/src/components/organisms/BoostHubSignInForm.tsx
+++ b/src/components/organisms/BoostHubSignInForm.tsx
@@ -15,7 +15,11 @@ import {
   FormSecondaryButton,
 } from '../atoms/form'
 import { generateId } from '../../lib/string'
-import { openLoginPage, createDesktopAccessToken } from '../../lib/boosthub'
+import {
+  openLoginPage,
+  createDesktopAccessToken,
+  getBoostHubTeamIconUrl,
+} from '../../lib/boosthub'
 import { useGeneralStatus } from '../../lib/generalStatus'
 import {
   BoostHubLoginEvent,
@@ -109,7 +113,10 @@ const BoostHubSignInForm = () => {
               id: team.id,
               name: team.name,
               domain: team.domain,
-              iconUrl: team.iconUrl,
+              iconUrl:
+                team.icon != null
+                  ? getBoostHubTeamIconUrl(team.icon.location)
+                  : undefined,
             }
           }),
         })
diff --git a/src/lib/boosthub.tsx b/src/lib/boosthub.tsx
index ab2bb54c18..49c12c7ad5 100644
--- a/src/lib/boosthub.tsx
+++ b/src/lib/boosthub.tsx
@@ -73,7 +73,12 @@ export async function fetchDesktopGlobalData(token: string) {
       uniqueName: string
       displayName: string
     }
-    teams: { id: string; name: string; domain: string; iconUrl?: string }[]
+    teams: {
+      id: string
+      name: string
+      domain: string
+      icon?: { location: string }
+    }[]
   }
 }