diff --git a/resources/views/livewire/server/partials/localhost-general.blade.php b/resources/views/livewire/server/partials/localhost-general.blade.php
index 1fd78c369c..cdbd3ab93b 100644
--- a/resources/views/livewire/server/partials/localhost-general.blade.php
+++ b/resources/views/livewire/server/partials/localhost-general.blade.php
@@ -3,14 +3,12 @@
                     <x-application.settings-section id="server-overview-section" title="Server overview"
                         helper="Operating system and hardware details for the server running this Coolify instance.">
                         <x-slot:actions>
-                            @if ($server->server_metadata)
-                                <x-forms.button type="button" wire:click="refreshServerMetadata"
-                                    :disabled="! $server->isFunctional()"
-                                    :tooltip="$server->isFunctional() ? null : 'Validate the connection first.'">
-                                    <x-reicon name="refresh" class="size-3.5" />
-                                    Refresh details
-                                </x-forms.button>
-                            @endif
+                            <x-forms.button type="button" wire:click="refreshServerMetadata"
+                                :disabled="! $server->isFunctional()"
+                                :tooltip="$server->isFunctional() ? null : 'Validate the connection first.'">
+                                <x-reicon name="refresh" class="size-3.5" />
+                                {{ $server->server_metadata ? 'Refresh details' : 'Fetch server details' }}
+                            </x-forms.button>
                             <x-forms.button type="button" wire:click.prevent="checkLocalhostConnection"
                                 :isHighlighted="! $server->isFunctional()" canGate="update" :canResource="$server">
                                 <x-reicon :name="$server->isFunctional() ? 'refresh' : 'alert-circle'" class="size-3.5" />
@@ -44,15 +42,6 @@
 
                         @if ($server->server_metadata)
                             @include('livewire.server.partials.server-details', ['server' => $server])
-                        @else
-                            <div class="mt-4 border-t border-neutral-200 pt-4 dark:border-white/[0.08]">
-                                <x-forms.button type="button" wire:click="refreshServerMetadata"
-                                    :disabled="! $server->isFunctional()"
-                                    :tooltip="$server->isFunctional() ? null : 'Validate the connection first.'">
-                                    <x-reicon name="refresh" class="size-3.5" />
-                                    Fetch server details
-                                </x-forms.button>
-                            </div>
                         @endif
                     </x-application.settings-section>
 
diff --git a/resources/views/livewire/server/partials/server-details.blade.php b/resources/views/livewire/server/partials/server-details.blade.php
index 262e54570d..0e2afa2543 100644
--- a/resources/views/livewire/server/partials/server-details.blade.php
+++ b/resources/views/livewire/server/partials/server-details.blade.php
@@ -21,7 +21,9 @@
         </div>
     @endforeach
 </dl>
-<div class="mt-5">
-    <p class="text-xs font-medium text-neutral-500 dark:text-fg-dim">GPUs</p>
-    <x-server.gpu-list :server="$server" class="mt-2" />
-</div>
+@if ($server->detectedGpus() !== [])
+    <div class="mt-5">
+        <p class="text-xs font-medium text-neutral-500 dark:text-fg-dim">GPUs</p>
+        <x-server.gpu-list :server="$server" class="mt-2" />
+    </div>
+@endif
diff --git a/resources/views/livewire/server/show.blade.php b/resources/views/livewire/server/show.blade.php
index e00177757f..cfbad137c9 100644
--- a/resources/views/livewire/server/show.blade.php
+++ b/resources/views/livewire/server/show.blade.php
@@ -313,14 +313,12 @@
                                     @endif
                                 @endif
                             @endif
-                            @if ($server->server_metadata)
-                                <x-forms.button type="button" wire:click="refreshServerMetadata"
-                                    :disabled="! $server->isFunctional()"
-                                    :tooltip="$server->isFunctional() ? null : 'Validate the connection first.'">
-                                    <x-reicon name="refresh" class="size-3.5" />
-                                    Refresh details
-                                </x-forms.button>
-                            @endif
+                            <x-forms.button type="button" wire:click="refreshServerMetadata"
+                                :disabled="! $server->isFunctional()"
+                                :tooltip="$server->isFunctional() ? null : 'Validate the connection first.'">
+                                <x-reicon name="refresh" class="size-3.5" />
+                                {{ $server->server_metadata ? 'Refresh details' : 'Fetch server details' }}
+                            </x-forms.button>
                         </x-slot:actions>
 
                         <div class="flex items-start gap-3">
@@ -346,15 +344,6 @@
 
                         @if ($server->server_metadata)
                             @include('livewire.server.partials.server-details', ['server' => $server])
-                        @else
-                            <div class="mt-4 border-t border-neutral-200 pt-4 dark:border-white/[0.08]">
-                                <x-forms.button type="button" wire:click="refreshServerMetadata"
-                                    :disabled="! $server->isFunctional()"
-                                    :tooltip="$server->isFunctional() ? null : 'Validate the connection first.'">
-                                    <x-reicon name="refresh" class="size-3.5" />
-                                    Fetch server details
-                                </x-forms.button>
-                            </div>
                         @endif
                     </x-application.settings-section>