diff --git a/frontend/src/app/main/data/workspace.cljs b/frontend/src/app/main/data/workspace.cljs
index d36dde063..21fb41f39 100644
--- a/frontend/src/app/main/data/workspace.cljs
+++ b/frontend/src/app/main/data/workspace.cljs
@@ -196,7 +196,7 @@
 
                           (->> stream
                                (rx/filter #(= ::dwc/index-initialized %))
-                               (rx/first)
+                               (rx/take 1)
                                (rx/map #(file-initialized bundle)))))))))
 
     ptk/EffectEvent
@@ -1636,7 +1636,7 @@
           (->> (rx/concat paste-transit-str
                           paste-plain-text-str
                           paste-image-str)
-               (rx/first)
+               (rx/take 1)
                (rx/catch
                 (fn [err]
                   (js/console.error "Clipboard error:" err)
diff --git a/frontend/src/app/main/data/workspace/colors.cljs b/frontend/src/app/main/data/workspace/colors.cljs
index 017cc967d..5c9d01fab 100644
--- a/frontend/src/app/main/data/workspace/colors.cljs
+++ b/frontend/src/app/main/data/workspace/colors.cljs
@@ -219,7 +219,7 @@
 
            ;; Hide the modal if the stop event is emitted
            (->> stop?
-                (rx/first)
+                (rx/take 1)
                 (rx/map #(md/hide))))))
 
       ptk/UpdateEvent
diff --git a/frontend/src/app/main/data/workspace/drawing.cljs b/frontend/src/app/main/data/workspace/drawing.cljs
index 14ec47a2a..1fc7186e9 100644
--- a/frontend/src/app/main/data/workspace/drawing.cljs
+++ b/frontend/src/app/main/data/workspace/drawing.cljs
@@ -74,7 +74,7 @@
              (rx/of (handle-drawing type))
              (->> stream
                   (rx/filter (ptk/type? ::common/handle-finish-drawing) )
-                  (rx/first)
+                  (rx/take 1)
                   (rx/map #(fn [state] (update state :workspace-drawing dissoc :lock)))))))))))
 
 (defn handle-drawing
diff --git a/frontend/src/app/main/data/workspace/layers.cljs b/frontend/src/app/main/data/workspace/layers.cljs
index 4344e13e8..0f06eac31 100644
--- a/frontend/src/app/main/data/workspace/layers.cljs
+++ b/frontend/src/app/main/data/workspace/layers.cljs
@@ -70,7 +70,7 @@
           (let [opacity-events (->> stream ;; Stop buffering after time without opacities
                                     (rx/filter (ptk/type? ::pressed-opacity))
                                     (rx/buffer-time 600)
-                                    (rx/first)
+                                    (rx/take 1)
                                     (rx/map #(set-opacity (calculate-opacity (map deref %)))))]
             (rx/concat
              (rx/of (set-opacity (calculate-opacity [opacity]))) ;; First opacity is always fired
diff --git a/frontend/src/app/main/data/workspace/transforms.cljs b/frontend/src/app/main/data/workspace/transforms.cljs
index 559895ddd..1d343f035 100644
--- a/frontend/src/app/main/data/workspace/transforms.cljs
+++ b/frontend/src/app/main/data/workspace/transforms.cljs
@@ -523,7 +523,7 @@
     (watch [_ _ stream]
       (->> stream
            (rx/filter (ptk/type? ::dws/duplicate-selected))
-           (rx/first)
+           (rx/take 1)
            (rx/map #(start-move from-position))))))
 
 (defn- start-move
@@ -612,7 +612,7 @@
                                  (rx/filter #(= direction (deref %))))
                 stopper (->> move-events
                              (rx/debounce 100)
-                             (rx/first))
+                             (rx/take 1))
                 scale (if shift? (gpt/point (:big nudge)) (gpt/point (:small nudge)))
                 mov-vec (gpt/multiply (get-displacement direction) scale)]
 
diff --git a/frontend/src/app/main/snap.cljs b/frontend/src/app/main/snap.cljs
index 1de5b1aab..3da469e5d 100644
--- a/frontend/src/app/main/snap.cljs
+++ b/frontend/src/app/main/snap.cljs
@@ -82,7 +82,7 @@
                    :frame-id frame-id
                    :axis coord
                    :ranges [[(- value 0.5) (+ value 0.5)]]})
-         (rx/first)
+         (rx/take 1)
          (rx/map (remove-from-snap-points remove-snap?))
          (rx/map flatten-to-points))))
 
@@ -98,7 +98,7 @@
                    :frame-id frame-id
                    :axis coord
                    :ranges ranges})
-         (rx/first)
+         (rx/take 1)
          (rx/map (remove-from-snap-points remove-snap?))
          (rx/map (get-min-distance-snap points coord)))))