diff --git a/frontend/scripts/dist-main.clj b/frontend/scripts/dist-main.clj
index e87322745..659662b38 100644
--- a/frontend/scripts/dist-main.clj
+++ b/frontend/scripts/dist-main.clj
@@ -12,7 +12,8 @@
     :output-dir "dist/js/main"
     :closure-defines {"uxbox.config.url" "https://test.uxbox.io/api"
                       "uxbox.config.viewurl" "https://test.uxbox.io/view/"}
-    :optimizations :simple
+    :optimizations :advanced
+    :cache-analysis false
     :externs ["externs/main.js"]
     :static-fns true
     :elide-asserts true
diff --git a/frontend/scripts/dist-view.clj b/frontend/scripts/dist-view.clj
index 9d3f98a65..7e4af2850 100644
--- a/frontend/scripts/dist-view.clj
+++ b/frontend/scripts/dist-view.clj
@@ -13,6 +13,7 @@
     :closure-defines {"uxbox.config.url" "https://test.uxbox.io/api"
                       "uxbox.config.viewurl" "https://test.uxbox.io/view/"}
     :optimizations :simple
+    :cache-analysis false
     :externs ["externs/main.js"]
     :static-fns true
     :elide-asserts true
diff --git a/frontend/scripts/dist-worker.clj b/frontend/scripts/dist-worker.clj
index a0fc82458..2f66128ac 100644
--- a/frontend/scripts/dist-worker.clj
+++ b/frontend/scripts/dist-worker.clj
@@ -12,6 +12,7 @@
     :asset-path "js"
     :parallel-build true
     :optimizations :advanced
+    :cache-analysis false
     :static-fns true
     :pretty-print false
     :language-in  :ecmascript6