diff --git a/CHANGES.md b/CHANGES.md
index 606650c491..7e747dc370 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -6,6 +6,7 @@
 
 ### :sparkles: New features
 
+- On user settings, hide the theme selector as long as we only have one theme [Taiga #2610](https://tree.taiga.io/project/penpot/us/2610)
 - Add recent used fonts in font selection widget [Taiga #1381](https://tree.taiga.io/project/penpot/us/1381)
 - Allow to align items relative to groups [Taiga #2533](https://tree.taiga.io/project/penpot/us/2533)
 - Scroll bars [Taiga #2550](https://tree.taiga.io/project/penpot/task/2550)
diff --git a/frontend/src/app/main/ui/settings/options.cljs b/frontend/src/app/main/ui/settings/options.cljs
index 66d213bdcb..1793d5bfb2 100644
--- a/frontend/src/app/main/ui/settings/options.cljs
+++ b/frontend/src/app/main/ui/settings/options.cljs
@@ -54,9 +54,10 @@
                      :default ""
                      :name :lang
                      :data-test "setting-lang"}]]
-
-     [:h2 (t locale "dashboard.theme-change")]
-     [:div.fields-row
+     
+     ;; TODO: Do not show as long as we only have one theme
+     #_[:h2 (t locale "dashboard.theme-change")]
+     #_[:div.fields-row
       [:& fm/select {:label (t locale "dashboard.select-ui-theme")
                      :name :theme
                      :default "default"