diff --git a/CHANGES.md b/CHANGES.md
index 58b0da4de5..4f71cbe20f 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -72,6 +72,7 @@
 - Fix gap input throwing an error [Github #8984](https://github.com/penpot/penpot/pull/8984)
 - Fix copy to be more specific [Taiga #13990](https://tree.taiga.io/project/penpot/issue/13990)
 - Allow deleting the profile avatar after uploading [Github #9067](https://github.com/penpot/penpot/issues/9067)
+- Fix incorrect rendering when exporting text as SVG, PNG and JPG (by @edwin-rivera-dev) [Github #8516](https://github.com/penpot/penpot/issues/8516)
 
 
 ## 2.16.0 (Unreleased)
diff --git a/exporter/src/app/browser.cljs b/exporter/src/app/browser.cljs
index 526ae77380..798a9c3f44 100644
--- a/exporter/src/app/browser.cljs
+++ b/exporter/src/app/browser.cljs
@@ -47,6 +47,19 @@
   [page ms]
   (.waitForTimeout ^js page ms))
 
+(defn wait-for-fonts
+  "Wait until the browser has finished loading all fonts"
+  ([page] (wait-for-fonts page nil))
+  ([page {:keys [timeout] :or {timeout 15000}}]
+   (-> (.waitForFunction ^js page
+                         "() => document.fonts && document.fonts.status === 'loaded'"
+                         nil
+                         #js {:timeout timeout})
+       (p/catch (fn [cause]
+                  (l/warn :hint "wait-for-fonts timed out; continuing anyway"
+                          :cause (ex-message cause))
+                  (p/resolved nil))))))
+
 (defn wait-for
   ([locator] (wait-for locator nil))
   ([locator {:keys [state timeout] :or {state "visible" timeout 10000}}]
diff --git a/exporter/src/app/renderer/bitmap.cljs b/exporter/src/app/renderer/bitmap.cljs
index 00c67ba508..bc8b06abf3 100644
--- a/exporter/src/app/renderer/bitmap.cljs
+++ b/exporter/src/app/renderer/bitmap.cljs
@@ -47,6 +47,7 @@
               ;; navigate to the page and perform basic setup
               (bw/nav! page (str uri))
               (bw/sleep page 1000) ; the good old fix with sleep
+              (bw/wait-for-fonts page)
               (bw/eval! page (js* "() => document.body.style.background = 'transparent'"))
 
               ;; take the screnshot of requested objects, one by one
diff --git a/exporter/src/app/renderer/pdf.cljs b/exporter/src/app/renderer/pdf.cljs
index 25bcfc036b..27402db513 100644
--- a/exporter/src/app/renderer/pdf.cljs
+++ b/exporter/src/app/renderer/pdf.cljs
@@ -66,6 +66,7 @@
                 (sync-page-size! dom)
                 (bw/screenshot dom {:full-page? true})
                 (bw/sleep page 2000) ; the good old fix with sleep
+                (bw/wait-for-fonts page)
                 (bw/pdf page {:path path})
                 path)))
 
diff --git a/exporter/src/app/renderer/svg.cljs b/exporter/src/app/renderer/svg.cljs
index 73558dbe5f..66e6dd61b2 100644
--- a/exporter/src/app/renderer/svg.cljs
+++ b/exporter/src/app/renderer/svg.cljs
@@ -338,6 +338,7 @@
               ;; navigate to the page and perform basic setup
               (bw/nav! page (str uri))
               (bw/sleep page 1000) ; the good old fix with sleep
+              (bw/wait-for-fonts page)
 
               ;; take the screnshot of requested objects, one by one
               (p/run (partial render-object page) objects)