diff --git a/resources/views/livewire/server/new/by-ip.blade.php b/resources/views/livewire/server/new/by-ip.blade.php
index 3b958c0b3..d1a8f4c15 100644
--- a/resources/views/livewire/server/new/by-ip.blade.php
+++ b/resources/views/livewire/server/new/by-ip.blade.php
@@ -25,8 +25,8 @@
                     @endif
                 @endforeach
             </x-forms.select>
-            <div class="w-72">
-                <div class="pt-6"> Swarm support is in alpha version. </div>
+            <div class="w-96">
+                <div class="pt-6"> Swarm support is in alpha version. Read the docs <a class='text-white' href='https://coolify.io/docs/swarm#deploy-with-persistent-storage' target='_blank'>here</a>.</div>
                 @if ($is_swarm_worker)
                     <x-forms.checkbox disabled instantSave type="checkbox" id="is_swarm_manager"
                         helper="For more information, please read the documentation <a class='text-white' href='https://coolify.io/docs/swarm' target='_blank'>here</a>."
@@ -45,24 +45,23 @@
                         helper="For more information, please read the documentation <a class='text-white' href='https://coolify.io/docs/swarm' target='_blank'>here</a>."
                         label="Is it a Swarm Worker?" />
                 @endif
-                @if ($is_swarm_worker)
-                <div class="py-4">
-                    <x-forms.select label="Select a Swarm Cluster" id="selected_swarm_cluster" required>
-                        @foreach ($swarm_managers as $server)
-                            @if ($loop->first)
-                                <option selected value="{{ $server->id }}">{{ $server->name }}</option>
-                            @else
-                                <option value="{{ $server->id }}">{{ $server->name }}</option>
-                            @endif
-                        @endforeach
-                    </x-forms.select>
-                </div>
+                @if ($is_swarm_worker && count($swarm_managers) > 0)
+                    <div class="py-4">
+                        <x-forms.select label="Select a Swarm Cluster" id="selected_swarm_cluster" required>
+                            @foreach ($swarm_managers as $server)
+                                @if ($loop->first)
+                                    <option selected value="{{ $server->id }}">{{ $server->name }}</option>
+                                @else
+                                    <option value="{{ $server->id }}">{{ $server->name }}</option>
+                                @endif
+                            @endforeach
+                        </x-forms.select>
+                    </div>
                 @endif
             </div>
             <x-forms.button type="submit">
-                Save New Server
+                Save Server
             </x-forms.button>
         </form>
-
     @endif
 </div>