diff --git a/app/Providers/RouteServiceProvider.php b/app/Providers/RouteServiceProvider.php
index 871d5d3f0..48d8bc91d 100644
--- a/app/Providers/RouteServiceProvider.php
+++ b/app/Providers/RouteServiceProvider.php
@@ -90,7 +90,7 @@ class RouteServiceProvider extends ServiceProvider
         // This means that an authenticated API user cannot use IP switching to get
         // around the limits.
         RateLimiter::for('api.client', function (Request $request) {
-            $key = optional($request->user())->uuid ?: $request->ip();
+            $key = $request->user()?->uuid ?: $request->ip();
 
             return Limit::perMinutes(
                 config('http.rate_limit.client_period'),
@@ -99,7 +99,7 @@ class RouteServiceProvider extends ServiceProvider
         });
 
         RateLimiter::for('api.application', function (Request $request) {
-            $key = optional($request->user())->uuid ?: $request->ip();
+            $key = $request->user()?->uuid ?: $request->ip();
 
             return Limit::perMinutes(
                 config('http.rate_limit.application_period'),
diff --git a/app/Transformers/Api/Client/ActivityLogTransformer.php b/app/Transformers/Api/Client/ActivityLogTransformer.php
index f108248a1..e0f339166 100644
--- a/app/Transformers/Api/Client/ActivityLogTransformer.php
+++ b/app/Transformers/Api/Client/ActivityLogTransformer.php
@@ -55,7 +55,7 @@ class ActivityLogTransformer extends BaseClientTransformer
 
         $properties = $model->properties
             ->mapWithKeys(function ($value, $key) use ($model) {
-                if ($key === 'ip' && !optional($model->actor)->is($this->request->user())) {
+                if ($key === 'ip' && !$model->actor?->is($this->request->user())) {
                     return [$key => '[hidden]'];
                 }
 
@@ -113,6 +113,6 @@ class ActivityLogTransformer extends BaseClientTransformer
      */
     protected function canViewIP(Model $actor = null): bool
     {
-        return optional($actor)->is($this->request->user()) || $this->request->user()->root_admin;
+        return $actor?->is($this->request->user()) || $this->request->user()->root_admin;
     }
 }