diff --git a/Web/Resgrid.Web/Areas/User/Views/Dispatch/Dashboard.cshtml b/Web/Resgrid.Web/Areas/User/Views/Dispatch/Dashboard.cshtml
index 9740429bc..fdac8dd64 100644
--- a/Web/Resgrid.Web/Areas/User/Views/Dispatch/Dashboard.cshtml
+++ b/Web/Resgrid.Web/Areas/User/Views/Dispatch/Dashboard.cshtml
@@ -5,6 +5,7 @@
 @{
   ViewBag.Title = "Resgrid | " + @commonLocalizer["CallsModule"];
   Layout = "~/Areas/User/Views/Shared/_UserLayout.cshtml";
+  ViewBag.LoadAngular = true;
 }
 @section Styles
   {
diff --git a/Web/Resgrid.Web/Areas/User/Views/Mapping/Index.cshtml b/Web/Resgrid.Web/Areas/User/Views/Mapping/Index.cshtml
index db718c369..fa044c94b 100644
--- a/Web/Resgrid.Web/Areas/User/Views/Mapping/Index.cshtml
+++ b/Web/Resgrid.Web/Areas/User/Views/Mapping/Index.cshtml
@@ -4,6 +4,7 @@
 @inject IStringLocalizer<Resgrid.Localization.Areas.User.Mapping.Mapping> localizer
 @{
 	ViewBag.Title = "Resgrid | " + localizer["MappingHeader"];
+	ViewBag.LoadAngular = true;
 }
 @section Styles
 {
diff --git a/Web/Resgrid.Web/Areas/User/Views/Shared/_UserLayout.cshtml b/Web/Resgrid.Web/Areas/User/Views/Shared/_UserLayout.cshtml
index e0743208e..f68defafa 100644
--- a/Web/Resgrid.Web/Areas/User/Views/Shared/_UserLayout.cshtml
+++ b/Web/Resgrid.Web/Areas/User/Views/Shared/_UserLayout.cshtml
@@ -17,8 +17,11 @@
 
     <link rel="stylesheet" href="/css/int-bundle.css" />
 
-    <link rel="stylesheet" href="/js/ng/styles.css" />
-    <link rel="stylesheet" href="https://fonts.googleapis.com/icon?family=Material+Icons" />
+    @if (ViewBag.LoadAngular == true)
+    {
+        <link rel="stylesheet" href="/js/ng/styles.css" />
+        <link rel="stylesheet" href="https://fonts.googleapis.com/icon?family=Material+Icons" />
+    }
 
     <link rel="shortcut icon" href="~/favicon.ico" />
     <link rel="apple-touch-icon" sizes="180x180" href="~/images/apple-touch-icon.png">
@@ -127,16 +130,19 @@
         localStorage.setItem("RgWebApp.auth-tokens", '@Html.Raw(await JavasriptHelpers.GetApiToken())');
     </script>
 
-    <environment names="Release,Staging,Production,Docker">
-        <script src="/js/ng/app.js"></script>
-    </environment>
-
-    <environment names="Development">
-        <script src="/js/ng/runtime.js" asp-append-version="false"></script>
-        <script src="/js/ng/polyfills.js" asp-append-version="false"></script>
-        <script src="/js/ng/vendor.js" asp-append-version="false"></script>
-        <script src="/js/ng/main.js" asp-append-version="false"></script>
-    </environment>
+    @if (ViewBag.LoadAngular == true)
+    {
+        <environment names="Release,Staging,Production,Docker">
+            <script src="/js/ng/app.js"></script>
+        </environment>
+
+        <environment names="Development">
+            <script src="/js/ng/runtime.js" asp-append-version="false"></script>
+            <script src="/js/ng/polyfills.js" asp-append-version="false"></script>
+            <script src="/js/ng/vendor.js" asp-append-version="false"></script>
+            <script src="/js/ng/main.js" asp-append-version="false"></script>
+        </environment>
+    }
 
     @if (IsSectionDefined("Scripts"))
     {
diff --git a/Web/Resgrid.Web/Areas/User/Views/Shifts/Index.cshtml b/Web/Resgrid.Web/Areas/User/Views/Shifts/Index.cshtml
index d4ef89891..6538450cf 100644
--- a/Web/Resgrid.Web/Areas/User/Views/Shifts/Index.cshtml
+++ b/Web/Resgrid.Web/Areas/User/Views/Shifts/Index.cshtml
@@ -5,6 +5,7 @@
 @{
 	ViewBag.Title = "Resgrid | " + localizer["ShiftsHeader"];
 	Layout = "~/Areas/User/Views/Shared/_UserLayout.cshtml";
+	ViewBag.LoadAngular = true;
 }
 
 @section Styles