diff --git a/server/commands/teamCreator.ts b/server/commands/teamCreator.ts
index 8c1cc2124..a5e6e7b48 100644
--- a/server/commands/teamCreator.ts
+++ b/server/commands/teamCreator.ts
@@ -38,7 +38,7 @@ async function teamCreator({
 }: Props): Promise<Team> {
   // If the service did not provide a logo/avatar then we attempt to generate
   // one via ClearBit, or fallback to colored initials in worst case scenario
-  if (!avatarUrl) {
+  if (!avatarUrl || !avatarUrl.startsWith("http")) {
     avatarUrl = await generateAvatarUrl({
       name,
       domain,
diff --git a/server/routes/api/team.ts b/server/routes/api/team.ts
index 7985a58fc..dd55c8138 100644
--- a/server/routes/api/team.ts
+++ b/server/routes/api/team.ts
@@ -117,7 +117,6 @@ router.post(
           name: user.name,
           email: user.email,
           isAdmin: true,
-          avatarUrl: user.avatarUrl,
         },
         { transaction }
       );