diff --git a/app/Repositories/ServerRepository.php b/app/Repositories/ServerRepository.php
index 6d8fa7654..6bc873410 100644
--- a/app/Repositories/ServerRepository.php
+++ b/app/Repositories/ServerRepository.php
@@ -398,7 +398,7 @@ class ServerRepository
             'add_additional' => 'array',
             'remove_additional' => 'array',
             'memory' => 'integer|min:0',
-            'swap' => 'integer|min:0',
+            'swap' => 'integer|min:-1',
             'io' => 'integer|min:10|max:1000',
             'cpu' => 'integer|min:0',
             'disk' => 'integer|min:0'
diff --git a/resources/views/admin/servers/new.blade.php b/resources/views/admin/servers/new.blade.php
index 9bb34e639..4d9bb9238 100644
--- a/resources/views/admin/servers/new.blade.php
+++ b/resources/views/admin/servers/new.blade.php
@@ -125,7 +125,7 @@
             </div>
             <div class="row">
                 <div class="col-md-12">
-                    <p class="text-muted"><small>If you do not want to assign swap space to a server simply put <code>0</code> for the value. We suggest leaving OOM Killer enabled unless you know what you are doing, disabling it could cause your server to hang unexpectedly.</small><p>
+                    <p class="text-muted"><small>If you do not want to assign swap space to a server simply put <code>0</code> for the value, or <code>-1</code> to allow unlimited swap space. If you want to disable memory limiting on a server simply enter <code>0</code> into the memory field. We suggest leaving OOM Killer enabled unless you know what you are doing, disabling it could cause your server to hang unexpectedly.</small><p>
                 </div>
             </div>
             <div class="row">