diff --git a/CHANGES.md b/CHANGES.md
index 09a3ab9d2..5e4f2f82e 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -48,6 +48,7 @@
 
 ### :bug: Bugs fixed
 
+- Do not show team-up modal for users already on a team [Taiga #3311](https://tree.taiga.io/project/penpot/issue/3311)
 - Constraints are not well assigned when default and multiselection [Taiga #3069](https://tree.taiga.io/project/penpot/issue/3069)
 - Duplicate artboards create new flows if needed [Taiga #2221](https://tree.taiga.io/project/penpot/issue/2221)
 - Round the size values on handoff to two decimals [Taiga #3227](https://tree.taiga.io/project/penpot/issue/3227)
diff --git a/frontend/src/app/main/ui/onboarding/team_choice.cljs b/frontend/src/app/main/ui/onboarding/team_choice.cljs
index 23773ba76..3df054a83 100644
--- a/frontend/src/app/main/ui/onboarding/team_choice.cljs
+++ b/frontend/src/app/main/ui/onboarding/team_choice.cljs
@@ -10,6 +10,7 @@
    [app.main.data.dashboard :as dd]
    [app.main.data.messages :as dm]
    [app.main.data.modal :as modal]
+   [app.main.refs :as refs]
    [app.main.store :as st]
    [app.main.ui.components.forms :as fm]
    [app.util.i18n :as i18n :refer [tr]]
@@ -37,25 +38,27 @@
         on-team-up
         (fn []
           (st/emit! (modal/show {:type :onboarding-team})))
-        ]
+        teams (mf/deref refs/teams)]
 
-    [:div.modal-overlay
-     [:div.modal-container.onboarding.final.animated.fadeInUp
-      [:div.modal-top
-       [:h1 {:data-test "onboarding-welcome-title"} (tr "onboarding.welcome.title")]
-       [:p (tr "onboarding.welcome.desc3")]]
-      [:div.modal-columns
-       [:div.modal-left
-        [:div.content-button {:on-click on-fly-solo
-                              :data-test "fly-solo-op"}
-         [:h2 (tr "onboarding.choice.fly-solo")]
-         [:p (tr "onboarding.choice.fly-solo-desc")]]]
-       [:div.modal-right
-        [:div.content-button {:on-click on-team-up :data-test "team-up-button"}
-         [:h2 (tr "onboarding.choice.team-up")]
-         [:p (tr "onboarding.choice.team-up-desc")]]]]
-      [:img.deco {:src "images/deco-left.png" :border "0"}]
-      [:img.deco.right {:src "images/deco-right.png" :border "0"}]]]))
+    (if (< (count teams) 2)
+      [:div.modal-overlay
+       [:div.modal-container.onboarding.final.animated.fadeInUp
+        [:div.modal-top
+         [:h1 {:data-test "onboarding-welcome-title"} (tr "onboarding.welcome.title")]
+         [:p (tr "onboarding.welcome.desc3")]]
+        [:div.modal-columns
+         [:div.modal-left
+          [:div.content-button {:on-click on-fly-solo
+                                :data-test "fly-solo-op"}
+           [:h2 (tr "onboarding.choice.fly-solo")]
+           [:p (tr "onboarding.choice.fly-solo-desc")]]]
+         [:div.modal-right
+          [:div.content-button {:on-click on-team-up :data-test "team-up-button"}
+           [:h2 (tr "onboarding.choice.team-up")]
+           [:p (tr "onboarding.choice.team-up-desc")]]]]
+        [:img.deco {:src "images/deco-left.png" :border "0"}]
+        [:img.deco.right {:src "images/deco-right.png" :border "0"}]]]
+      [:div {:on-load on-fly-solo}])))
 
 (mf/defc onboarding-team-modal
   {::mf/register modal/components