diff --git a/frontend/src/app/main/data/workspace/libraries.cljs b/frontend/src/app/main/data/workspace/libraries.cljs
index 65f456cbc5..c24d1d4691 100644
--- a/frontend/src/app/main/data/workspace/libraries.cljs
+++ b/frontend/src/app/main/data/workspace/libraries.cljs
@@ -808,7 +808,7 @@
         component       (ctkl/get-component data component-id)
         page-id         (:main-instance-page component)
         root-id         (:main-instance-id component)]
-    (dwt/request-thumbnail file-id page-id root-id tag)))
+    (dwt/request-thumbnail file-id page-id root-id tag "update-component-thumbnail-sync")))
 
 (defn update-component-sync
   ([shape-id file-id] (update-component-sync shape-id file-id nil))
diff --git a/frontend/src/app/main/data/workspace/thumbnails.cljs b/frontend/src/app/main/data/workspace/thumbnails.cljs
index b1328b98ac..e2cb1cacc9 100644
--- a/frontend/src/app/main/data/workspace/thumbnails.cljs
+++ b/frontend/src/app/main/data/workspace/thumbnails.cljs
@@ -58,15 +58,17 @@
 
 (defn request-thumbnail
   "Enqueues a request to generate a thumbnail for the given ids."
-  [file-id page-id shape-id tag]
-  (ptk/reify ::request-thumbnail
-    ptk/EffectEvent
-    (effect [_ _ _]
-      (l/dbg :hint "request thumbnail" :file-id file-id :page-id page-id :shape-id shape-id :tag tag)
-      (q/enqueue-unique
-       queue
-       (create-request file-id page-id shape-id tag)
-       (partial find-request file-id page-id shape-id tag)))))
+  ([file-id page-id shape-id tag]
+   (request-thumbnail file-id page-id shape-id tag "unknown"))
+  ([file-id page-id shape-id tag requester]
+   (ptk/reify ::request-thumbnail
+     ptk/EffectEvent
+     (effect [_ _ _]
+       (l/dbg :hint "request thumbnail" :requester requester :file-id file-id :page-id page-id :shape-id shape-id :tag tag)
+       (q/enqueue-unique
+        queue
+        (create-request file-id page-id shape-id tag)
+        (partial find-request file-id page-id shape-id tag))))))
 
 ;; This function first renders the HTML calling `render/render-frame` that
 ;; returns HTML as a string, then we send that data to the iframe rasterizer
@@ -291,6 +293,6 @@
               (->> all-changes-s
                    (rx/buffer-until notifier-s)
                    (rx/mapcat #(into #{} %))
-                   (rx/map #(request-thumbnail file-id page-id % "frame"))))
+                   (rx/map #(request-thumbnail file-id page-id % "frame" "watch-state-changes"))))
 
              (rx/take-until stopper-s))))))
diff --git a/frontend/src/app/main/ui/workspace/shapes/frame.cljs b/frontend/src/app/main/ui/workspace/shapes/frame.cljs
index d7a3d0e23b..cd60ec811d 100644
--- a/frontend/src/app/main/ui/workspace/shapes/frame.cljs
+++ b/frontend/src/app/main/ui/workspace/shapes/frame.cljs
@@ -107,9 +107,9 @@
     (-> (image-size href)
         (p/then
          (fn [{:keys [width height]}]
-           (when (or (not (mth/close? width fixed-width 2))
-                     (not (mth/close? height fixed-height 2)))
-             (st/emit! (dwt/request-thumbnail file-id page-id frame-id "frame"))))))))
+           (when (or (not (mth/close? width fixed-width 5))
+                     (not (mth/close? height fixed-height 5)))
+             (st/emit! (dwt/request-thumbnail file-id page-id frame-id "frame" "check-thumbnail-size"))))))))
 
 (defn root-frame-wrapper-factory
   [shape-wrapper]
@@ -175,7 +175,7 @@
         (mf/with-effect []
           (when-not (some? thumbnail-uri)
             (tm/schedule-on-idle
-             #(st/emit! (dwt/request-thumbnail file-id page-id frame-id "frame"))))
+             #(st/emit! (dwt/request-thumbnail file-id page-id frame-id "frame" "root-frame"))))
           #(when-let [task (mf/ref-val task-ref)]
              (d/close! task)))