diff --git a/app/Filament/Resources/ServerResource.php b/app/Filament/Resources/ServerResource.php
index 576986242..aac79bcd7 100644
--- a/app/Filament/Resources/ServerResource.php
+++ b/app/Filament/Resources/ServerResource.php
@@ -334,7 +334,7 @@ class ServerResource extends Resource
                         }
 
                         $variables = [];
-                        $set($path = 'server_variables', $serverVariables->all());
+                        $set($path = 'server_variables', $serverVariables->sortBy(['sort'])->all());
                         for ($i = 0; $i < $serverVariables->count(); $i++) {
                             $set("$path.$i.variable_value", $serverVariables[$i]['default_value']);
                             $set("$path.$i.variable_id", $serverVariables[$i]['id']);
diff --git a/app/Filament/Resources/ServerResource/Pages/CreateServer.php b/app/Filament/Resources/ServerResource/Pages/CreateServer.php
index f942ee3db..4d52ef351 100644
--- a/app/Filament/Resources/ServerResource/Pages/CreateServer.php
+++ b/app/Filament/Resources/ServerResource/Pages/CreateServer.php
@@ -271,7 +271,7 @@ class CreateServer extends CreateRecord
                         }
 
                         $variables = [];
-                        $set($path = 'server_variables', $serverVariables->all());
+                        $set($path = 'server_variables', $serverVariables->sortBy(['sort'])->all());
                         for ($i = 0; $i < $serverVariables->count(); $i++) {
                             $set("$path.$i.variable_value", $serverVariables[$i]['default_value']);
                             $set("$path.$i.variable_id", $serverVariables[$i]['id']);