diff --git a/frontend/src/uxbox/main/ui/workspace/base.cljs b/frontend/src/uxbox/main/ui/workspace/base.cljs
index 58118c8c6f..2da0e46864 100644
--- a/frontend/src/uxbox/main/ui/workspace/base.cljs
+++ b/frontend/src/uxbox/main/ui/workspace/base.cljs
@@ -69,7 +69,7 @@
 
 ;; --- Scroll Stream
 
-(defonce scroll-b (rx/bus))
+(defonce scroll-b (rx/subject))
 
 (defonce scroll-s
   (as-> scroll-b $
@@ -82,12 +82,12 @@
 
 ;; --- Events
 
-(defonce events-b (rx/bus))
+(defonce events-b (rx/subject))
 (defonce events-s (rx/dedupe events-b))
 
 ;; --- Mouse Position Stream
 
-(defonce mouse-b (rx/bus))
+(defonce mouse-b (rx/subject))
 (defonce mouse-s (rx/dedupe mouse-b))
 
 (defonce mouse-canvas-s
diff --git a/frontend/src/uxbox/main/ui/workspace/drawarea.cljs b/frontend/src/uxbox/main/ui/workspace/drawarea.cljs
index 8acb3c8869..edbd79924e 100644
--- a/frontend/src/uxbox/main/ui/workspace/drawarea.cljs
+++ b/frontend/src/uxbox/main/ui/workspace/drawarea.cljs
@@ -24,7 +24,7 @@
 
 ;; --- State
 
-(defonce drawing-stoper (rx/bus))
+(defonce drawing-stoper (rx/subject))
 (defonce drawing-shape (atom nil))
 (defonce drawing-position (atom nil))