diff --git a/resources/views/v1/javascript/variables.twig b/resources/views/v1/javascript/variables.twig
index cee6c8504e..2efd9f9125 100644
--- a/resources/views/v1/javascript/variables.twig
+++ b/resources/views/v1/javascript/variables.twig
@@ -17,8 +17,6 @@ customRange: "{{ 'customRange'|_ }}"
 }
 };
 
-moment ??= function() {};
-
 // date range actual configuration:
 var dateRangeConfig = {
 startDate: moment("{{ dateRangeConfig.start }}"),
diff --git a/resources/views/v2/layout/default.twig b/resources/views/v2/layout/default.twig
index 16dde4f62e..d9bdc2da35 100644
--- a/resources/views/v2/layout/default.twig
+++ b/resources/views/v2/layout/default.twig
@@ -84,7 +84,7 @@
 </div>
 <!-- ./wrapper -->
 
-<script src="{{ route('javascript.v2.variables') }}" nonce="{{ JS_NONCE }}"></script>
+<script src="{{ route('javascript.v2.variables') }}?layout=v2" nonce="{{ JS_NONCE }}"></script>
 <script src="v2/js/manifest.js" nonce="{{ JS_NONCE }}"></script>
 <script src="v2/js/vendor.js" nonce="{{ JS_NONCE }}"></script>
 {% block scripts %}{% endblock %}