diff --git a/CHANGES.md b/CHANGES.md
index 735b893ab..d2c57891c 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -14,6 +14,7 @@
 - Fix menu context for single element nested in components [#1186](https://github.com/penpot/penpot/issues/1186)
 - Fix error screen when operations over comments fail [#1219](https://github.com/penpot/penpot/issues/1219)
 - Fix undo problem when changing typography/color from library [#1230](https://github.com/penpot/penpot/issues/1230)
+- Fix problem with text margin while rendering [#1231](https://github.com/penpot/penpot/issues/1231)
 
 ### :arrow_up: Deps updates
 ### :boom: Breaking changes
diff --git a/frontend/src/app/main/ui/shapes/text/styles.cljs b/frontend/src/app/main/ui/shapes/text/styles.cljs
index 2dca984ef..25e386262 100644
--- a/frontend/src/app/main/ui/shapes/text/styles.cljs
+++ b/frontend/src/app/main/ui/shapes/text/styles.cljs
@@ -40,6 +40,7 @@
          :justifyContent "inherit"
          :minHeight (when-not (or auto-width? auto-height?) "100%")
          :minWidth (when-not auto-width? "100%")
+         :marginRight "1px"
          :verticalAlign "top"}))
 
 (defn generate-paragraph-styles
diff --git a/frontend/src/app/main/ui/workspace/viewport.cljs b/frontend/src/app/main/ui/workspace/viewport.cljs
index 34c72e50a..53d82208a 100644
--- a/frontend/src/app/main/ui/workspace/viewport.cljs
+++ b/frontend/src/app/main/ui/workspace/viewport.cljs
@@ -197,7 +197,7 @@
 
       [:& use/export-page {:options options}]
 
-      [:& (mf/provider use/include-metadata-ctx) {:value true}
+      [:& (mf/provider use/include-metadata-ctx) {:value false}
        [:& (mf/provider embed/context) {:value true}
         ;; Render root shape
         [:& shapes/root-shape {:key page-id