diff --git a/CHANGES.md b/CHANGES.md
index 28e18de98..44760346d 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -6,6 +6,9 @@
 ### :boom: Breaking changes
 ### :sparkles: New features
 ### :bug: Bugs fixed
+
+- Fix problem with exporting before the document is saved [Taiga #2189](https://tree.taiga.io/project/penpot/issue/2189)
+
 ### :arrow_up: Deps updates
 ### :heart: Community contributions by (Thank you!)
 
diff --git a/frontend/src/app/main/data/workspace/persistence.cljs b/frontend/src/app/main/data/workspace/persistence.cljs
index c6acba6e5..f24d2a280 100644
--- a/frontend/src/app/main/data/workspace/persistence.cljs
+++ b/frontend/src/app/main/data/workspace/persistence.cljs
@@ -201,6 +201,9 @@
 (s/def ::shapes-changes-persisted
   (s/keys :req-un [::revn ::cp/changes]))
 
+(defn shapes-persited-event? [event]
+  (= (ptk/type event) ::changes-persisted))
+
 (defn shapes-changes-persisted
   [file-id {:keys [revn changes] :as params}]
   (us/verify ::us/uuid file-id)
diff --git a/frontend/src/app/main/ui/workspace/sidebar/options/menus/exports.cljs b/frontend/src/app/main/ui/workspace/sidebar/options/menus/exports.cljs
index 7e65db893..1b63eaeed 100644
--- a/frontend/src/app/main/ui/workspace/sidebar/options/menus/exports.cljs
+++ b/frontend/src/app/main/ui/workspace/sidebar/options/menus/exports.cljs
@@ -9,6 +9,7 @@
    [app.common.data :as d]
    [app.main.data.messages :as dm]
    [app.main.data.workspace :as udw]
+   [app.main.data.workspace.persistence :as dwp]
    [app.main.repo :as rp]
    [app.main.store :as st]
    [app.main.ui.icons :as i]
@@ -19,12 +20,22 @@
 
 (defn request-export
   [shape exports]
-  (rp/query! :export
-             {:page-id (:page-id shape)
-              :file-id  (:file-id shape)
-              :object-id (:id shape)
-              :name (:name shape)
-              :exports exports}))
+  (let [result-stream
+        (->> st/stream
+             (rx/filter dwp/shapes-persited-event?)
+             (rx/take 1)
+             (rx/flat-map
+              #(rp/query!
+                :export
+                {:page-id (:page-id shape)
+                 :file-id  (:file-id shape)
+                 :object-id (:id shape)
+                 :name (:name shape)
+                 :exports exports})))]
+
+    ;; Force a persist before exporting otherwise the exported shape could be outdated
+    (st/emit! ::dwp/force-persist)
+    result-stream))
 
 (mf/defc exports-menu
   [{:keys [shape page-id file-id] :as props}]