diff --git a/frontend/src/app/main/data/workspace.cljs b/frontend/src/app/main/data/workspace.cljs
index 382268f025..183e9e9eb8 100644
--- a/frontend/src/app/main/data/workspace.cljs
+++ b/frontend/src/app/main/data/workspace.cljs
@@ -354,7 +354,7 @@
                 (dcm/retrieve-comment-threads file-id)
                 (fetch-bundle project-id file-id))
 
-         (when (contains? cf/flags :renderer-v2)
+         (when (contains? cf/flags :renderer-v2-cpp)
            (rx/of (renderer/init)))
 
          (->> stream
diff --git a/frontend/src/app/main/ui/workspace/viewport.cljs b/frontend/src/app/main/ui/workspace/viewport.cljs
index c7c3972a1e..a8351edf0e 100644
--- a/frontend/src/app/main/ui/workspace/viewport.cljs
+++ b/frontend/src/app/main/ui/workspace/viewport.cljs
@@ -314,7 +314,7 @@
                                          :layout layout
                                          :viewport-ref viewport-ref}])]
 
-     (if (contains? cf/flags :renderer-v2)
+     (if (contains? cf/flags :renderer-v2-cpp)
        [:canvas {:id "render"
                  :ref canvas-ref
                  :class (stl/css :render-shapes)