diff --git a/CHANGES.md b/CHANGES.md
index 633a9b697..de65238e4 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -54,6 +54,7 @@
 - Fix problem when importing a file with grids [Taiga #2314](https://tree.taiga.io/project/penpot/issue/2314)
 - Fix issues when updating selrect in paths [Taiga #2366](https://tree.taiga.io/project/penpot/issue/2366)
 - Fix scroll jumps in handoff mode [Taiga #2383](https://tree.taiga.io/project/penpot/issue/2383)
+- Fix handoff text with opacity [Taiga #2384](https://tree.taiga.io/project/penpot/issue/2384)
 
 ### :arrow_up: Deps updates
 
diff --git a/frontend/src/app/util/code_gen.cljs b/frontend/src/app/util/code_gen.cljs
index a4069406c..19978d5a8 100644
--- a/frontend/src/app/util/code_gen.cljs
+++ b/frontend/src/app/util/code_gen.cljs
@@ -180,8 +180,9 @@
         shape-to-prop    (->> text-shape-style vals (map :to-prop) (reduce merge))
         shape-format     (->> text-shape-style vals (map :format) (reduce merge))
 
-
-        text-values      (->> (search-text-attrs (:content shape) (conj (:props style-text) :fill-color-gradient))
+        text-values      (->> (search-text-attrs
+                               (:content shape)
+                               (conj (:props style-text) :fill-color-gradient :fill-opacity))
                               (d/merge txt/default-text-attrs))]
     (str/join
      "\n"