diff --git a/frontend/src/app/config.cljs b/frontend/src/app/config.cljs
index 51b244551..8f93adf39 100644
--- a/frontend/src/app/config.cljs
+++ b/frontend/src/app/config.cljs
@@ -63,11 +63,11 @@
     :browser
     :webworker))
 
-(def default-flags
-  [:enable-onboarding
-   :enable-onboarding-team
-   :enable-onboarding-questions
-   :enable-onboarding-newsletter
+(def default-flags   ;;uncomment the below flags when Penpot Tokens Studio is ready to be merged into Penpot
+  [;;:enable-onboarding
+   ;;:enable-onboarding-team
+   ;;:enable-onboarding-questions
+   ;;:enable-onboarding-newsletter
    :enable-dashboard-templates-section
    :enable-google-fonts-provider])
 
diff --git a/frontend/src/app/main/ui/onboarding.cljs b/frontend/src/app/main/ui/onboarding.cljs
index f79b2e81a..07d3d92fe 100644
--- a/frontend/src/app/main/ui/onboarding.cljs
+++ b/frontend/src/app/main/ui/onboarding.cljs
@@ -142,7 +142,9 @@
              (modal/show! {:type :onboarding-newsletter})
 
              (contains? cf/flags :onboarding-team)
-             (modal/show! {:type :onboarding-team}))))
+             (modal/show! {:type :onboarding-team})
+             :else ;;remove this else condition when Penpot Tokens Studio is ready to be merged into Penpot
+             (modal/hide!))))
 
         onboarding-a-b-test? (cf/external-feature-flag "signup-background" "test")]