diff --git a/resources/views/livewire/project/application/configuration.blade.php b/resources/views/livewire/project/application/configuration.blade.php
index b8f4b96f6..c56de42c9 100644
--- a/resources/views/livewire/project/application/configuration.blade.php
+++ b/resources/views/livewire/project/application/configuration.blade.php
@@ -85,39 +85,39 @@
                 wire:navigate>Danger Zone</a>
         </div>
         <div class="w-full">
-            @if (request()->route()->getName() === 'project.application.configuration')
+            @if ($currentRoute === 'project.application.configuration')
                 <livewire:project.application.general :application="$application" />
-            @elseif (request()->route()->getName() === 'project.application.swarm' && $application->destination->server->isSwarm())
+            @elseif ($currentRoute === 'project.application.swarm' && $application->destination->server->isSwarm())
                 <livewire:project.application.swarm :application="$application" />
-            @elseif (request()->route()->getName() === 'project.application.advanced')
+            @elseif ($currentRoute === 'project.application.advanced')
                 <livewire:project.application.advanced :application="$application" />
-            @elseif (request()->route()->getName() === 'project.application.environment-variables')
+            @elseif ($currentRoute === 'project.application.environment-variables')
                 <livewire:project.shared.environment-variable.all :resource="$application" />
-            @elseif (request()->route()->getName() === 'project.application.persistent-storage')
+            @elseif ($currentRoute === 'project.application.persistent-storage')
                 <livewire:project.service.storage :resource="$application" />
-            @elseif (request()->route()->getName() === 'project.application.source' && $application->git_based())
+            @elseif ($currentRoute === 'project.application.source' && $application->git_based())
                 <livewire:project.application.source :application="$application" />
-            @elseif (request()->route()->getName() === 'project.application.servers')
+            @elseif ($currentRoute === 'project.application.servers')
                 <livewire:project.shared.destination :resource="$application" />
-            @elseif (request()->route()->getName() === 'project.application.scheduled-tasks.show')
+            @elseif ($currentRoute === 'project.application.scheduled-tasks.show')
                 <livewire:project.shared.scheduled-task.all :resource="$application" />
-            @elseif (request()->route()->getName() === 'project.application.webhooks')
+            @elseif ($currentRoute === 'project.application.webhooks')
                 <livewire:project.shared.webhooks :resource="$application" />
-            @elseif (request()->route()->getName() === 'project.application.preview-deployments')
+            @elseif ($currentRoute === 'project.application.preview-deployments')
                 <livewire:project.application.previews :application="$application" />
-            @elseif (request()->route()->getName() === 'project.application.healthcheck')
+            @elseif ($currentRoute === 'project.application.healthcheck')
                 <livewire:project.shared.health-checks :resource="$application" />
-            @elseif (request()->route()->getName() === 'project.application.rollback')
+            @elseif ($currentRoute === 'project.application.rollback')
                 <livewire:project.application.rollback :application="$application" />
-            @elseif (request()->route()->getName() === 'project.application.resource-limits')
+            @elseif ($currentRoute === 'project.application.resource-limits')
                 <livewire:project.shared.resource-limits :resource="$application" />
-            @elseif (request()->route()->getName() === 'project.application.resource-operations')
+            @elseif ($currentRoute === 'project.application.resource-operations')
                 <livewire:project.shared.resource-operations :resource="$application" />
-            @elseif (request()->route()->getName() === 'project.application.metrics')
+            @elseif ($currentRoute === 'project.application.metrics')
                 <livewire:project.shared.metrics :resource="$application" />
-            @elseif (request()->route()->getName() === 'project.application.tags')
+            @elseif ($currentRoute === 'project.application.tags')
                 <livewire:project.shared.tags :resource="$application" />
-            @elseif (request()->route()->getName() === 'project.application.danger')
+            @elseif ($currentRoute === 'project.application.danger')
                 <livewire:project.shared.danger :resource="$application" />
             @endif
         </div>
diff --git a/resources/views/livewire/project/database/configuration.blade.php b/resources/views/livewire/project/database/configuration.blade.php
index 8575f34b6..4ea3be105 100644
--- a/resources/views/livewire/project/database/configuration.blade.php
+++ b/resources/views/livewire/project/database/configuration.blade.php
@@ -42,7 +42,7 @@
                 wire:navigate>Danger Zone</a>
         </div>
         <div class="w-full">
-            @if (request()->route()->getName() === 'project.database.configuration')
+            @if ($currentRoute === 'project.database.configuration')
                 @if ($database->type() === 'standalone-postgresql')
                     <livewire:project.database.postgresql.general :database="$database" />
                 @elseif ($database->type() === 'standalone-redis')
@@ -60,25 +60,25 @@
                 @elseif ($database->type() === 'standalone-clickhouse')
                     <livewire:project.database.clickhouse.general :database="$database" />
                 @endif
-            @elseif (request()->route()->getName() === 'project.database.environment-variables')
+            @elseif ($currentRoute === 'project.database.environment-variables')
                 <livewire:project.shared.environment-variable.all :resource="$database" />
-            @elseif (request()->route()->getName() === 'project.database.servers')
+            @elseif ($currentRoute === 'project.database.servers')
                 <livewire:project.shared.destination :resource="$database" />
-            @elseif (request()->route()->getName() === 'project.database.persistent-storage')
+            @elseif ($currentRoute === 'project.database.persistent-storage')
                 <livewire:project.service.storage :resource="$database" />
-            @elseif (request()->route()->getName() === 'project.database.import-backups')
+            @elseif ($currentRoute === 'project.database.import-backups')
                 <livewire:project.database.import :resource="$database" />
-            @elseif (request()->route()->getName() === 'project.database.webhooks')
+            @elseif ($currentRoute === 'project.database.webhooks')
                 <livewire:project.shared.webhooks :resource="$database" />
-            @elseif (request()->route()->getName() === 'project.database.resource-limits')
+            @elseif ($currentRoute === 'project.database.resource-limits')
                 <livewire:project.shared.resource-limits :resource="$database" />
-            @elseif (request()->route()->getName() === 'project.database.resource-operations')
+            @elseif ($currentRoute === 'project.database.resource-operations')
                 <livewire:project.shared.resource-operations :resource="$database" />
-            @elseif (request()->route()->getName() === 'project.database.metrics')
+            @elseif ($currentRoute === 'project.database.metrics')
                 <livewire:project.shared.metrics :resource="$database" />
-            @elseif (request()->route()->getName() === 'project.database.tags')
+            @elseif ($currentRoute === 'project.database.tags')
                 <livewire:project.shared.tags :resource="$database" />
-            @elseif (request()->route()->getName() === 'project.database.danger')
+            @elseif ($currentRoute === 'project.database.danger')
                 <livewire:project.shared.danger :resource="$database" />
             @endif
         </div>
diff --git a/resources/views/livewire/project/service/configuration.blade.php b/resources/views/livewire/project/service/configuration.blade.php
index 196e7f2fd..7434a1b6f 100644
--- a/resources/views/livewire/project/service/configuration.blade.php
+++ b/resources/views/livewire/project/service/configuration.blade.php
@@ -36,7 +36,7 @@
                 wire:navigate>Danger Zone</a>
         </div>
         <div class="w-full">
-            @if (request()->route()->getName() === 'project.service.configuration')
+            @if ($currentRoute === 'project.service.configuration')
                 <livewire:project.service.stack-form :service="$service" />
                 <h3>Services</h3>
                 <div class="grid grid-cols-1 gap-2 pt-4 xl:grid-cols-1">
@@ -165,9 +165,9 @@
                         </div>
                     @endforeach
                 </div>
-            @elseif (request()->route()->getName() === 'project.service.environment-variables')
+            @elseif ($currentRoute === 'project.service.environment-variables')
                 <livewire:project.shared.environment-variable.all :resource="$service" />
-            @elseif (request()->route()->getName() === 'project.service.storages')
+            @elseif ($currentRoute === 'project.service.storages')
                 <div class="flex gap-2 items-center">
                     <h2>Storages</h2>
                 </div>
@@ -181,15 +181,15 @@
                 @foreach ($databases as $database)
                     <livewire:project.service.storage wire:key="database-{{ $database->id }}" :resource="$database" />
                 @endforeach
-            @elseif (request()->route()->getName() === 'project.service.scheduled-tasks.show')
+            @elseif ($currentRoute === 'project.service.scheduled-tasks.show')
                 <livewire:project.shared.scheduled-task.all :resource="$service" />
-            @elseif (request()->route()->getName() === 'project.service.webhooks')
+            @elseif ($currentRoute === 'project.service.webhooks')
                 <livewire:project.shared.webhooks :resource="$service" />
-            @elseif (request()->route()->getName() === 'project.service.resource-operations')
+            @elseif ($currentRoute === 'project.service.resource-operations')
                 <livewire:project.shared.resource-operations :resource="$service" />
-            @elseif (request()->route()->getName() === 'project.service.tags')
+            @elseif ($currentRoute === 'project.service.tags')
                 <livewire:project.shared.tags :resource="$service" />
-            @elseif (request()->route()->getName() === 'project.service.danger')
+            @elseif ($currentRoute === 'project.service.danger')
                 <livewire:project.shared.danger :resource="$service" />
             @endif
         </div>