diff --git a/src/Http/Middleware/CP/Localize.php b/src/Http/Middleware/CP/Localize.php
index 1b629e40f2b..cb06b381457 100644
--- a/src/Http/Middleware/CP/Localize.php
+++ b/src/Http/Middleware/CP/Localize.php
@@ -30,9 +30,11 @@ public function handle($request, Closure $next)
 
         Date::setToStringFormat(DateTime::ATOM);
 
-        $response = $next($request);
-
-        Date::setToStringFormat($originalToStringFormat);
+        try {
+            $response = $next($request);
+        } finally {
+            Date::setToStringFormat($originalToStringFormat);
+        }
 
         return $response;
     }
diff --git a/src/Providers/CpServiceProvider.php b/src/Providers/CpServiceProvider.php
index 4838daa5ba9..6f79fa87960 100644
--- a/src/Providers/CpServiceProvider.php
+++ b/src/Providers/CpServiceProvider.php
@@ -106,8 +106,8 @@ protected function registerMiddlewareGroups()
 
         $router->middlewareGroup('statamic.cp.authenticated', [
             \Statamic\Http\Middleware\CP\AuthenticateSession::class,
-            \Statamic\Http\Middleware\CP\Authorize::class,
             \Statamic\Http\Middleware\CP\Localize::class,
+            \Statamic\Http\Middleware\CP\Authorize::class,
             \Statamic\Http\Middleware\CP\SelectedSite::class,
             \Statamic\Http\Middleware\CP\BootPermissions::class,
             \Statamic\Http\Middleware\CP\BootPreferences::class,