diff --git a/Bootstrap.Admin/Controllers/HomeController.cs b/Bootstrap.Admin/Controllers/HomeController.cs
index c1e17c8f..c6f095d6 100644
--- a/Bootstrap.Admin/Controllers/HomeController.cs
+++ b/Bootstrap.Admin/Controllers/HomeController.cs
@@ -28,7 +28,8 @@ namespace Bootstrap.Admin.Controllers
         [AllowAnonymous]
         public IActionResult Error(int id)
         {
-            ViewBag.ReturnUrl = Request.Query[CookieAuthenticationDefaults.ReturnUrlParameter].ToString() ?? Url.Content("~/Home/Index");
+            var returnUrl = Request.Query[CookieAuthenticationDefaults.ReturnUrlParameter].ToString();
+            ViewBag.ReturnUrl = string.IsNullOrEmpty(returnUrl) ? Url.Content("~/Home/Index") : returnUrl;
             return id == 404 ? View("NotFound") : View();
         }
     }
diff --git a/Bootstrap.Client/Controllers/HomeController.cs b/Bootstrap.Client/Controllers/HomeController.cs
index 8a209605..59b9ac89 100644
--- a/Bootstrap.Client/Controllers/HomeController.cs
+++ b/Bootstrap.Client/Controllers/HomeController.cs
@@ -28,7 +28,8 @@ namespace Bootstrap.Client.Controllers
         [AllowAnonymous]
         public IActionResult Error(int id)
         {
-            var uriBuilder = new UriBuilder(ConfigurationManager.AppSettings["AuthHost"]) { Path = Request.Path, Query = QueryString.Create(CookieAuthenticationDefaults.ReturnUrlParameter, $"{Request.Scheme}://{Request.Host}{Request.PathBase}").ToString() };
+            var uriBuilder = new UriBuilder(ConfigurationManager.AppSettings["AuthHost"]) { Query = QueryString.Create(CookieAuthenticationDefaults.ReturnUrlParameter, $"{Request.Scheme}://{Request.Host}{Request.PathBase}").ToString() };
+            uriBuilder.Path += Request.Path;
             return Redirect(uriBuilder.ToString());
         }
     }