diff --git a/app/Filament/Server/Resources/Files/Pages/EditFiles.php b/app/Filament/Server/Resources/Files/Pages/EditFiles.php
index 3596e75f5..a3108b7c7 100644
--- a/app/Filament/Server/Resources/Files/Pages/EditFiles.php
+++ b/app/Filament/Server/Resources/Files/Pages/EditFiles.php
@@ -149,11 +149,7 @@ class EditFiles extends Page
                                 try {
                                     $contents = $this->getDaemonFileRepository()->getContent($this->path, config('panel.files.max_edit_size'));
 
-                                    if (mb_check_encoding($contents, 'UTF-8')) {
-                                        return $contents;
-                                    }
-
-                                    return mb_convert_encoding($contents, 'UTF-8', 'ISO-8859-1');
+                                    return mb_convert_encoding($contents, 'UTF-8', ['UTF-8', 'UTF-16', 'ISO-8859-1', 'ASCII']);
                                 } catch (FileSizeTooLargeException) {
                                     AlertBanner::make('file_too_large')
                                         ->title(trans('server/file.alerts.file_too_large.title', ['name' => basename($this->path)]))
diff --git a/app/Http/Controllers/Api/Client/Servers/FileController.php b/app/Http/Controllers/Api/Client/Servers/FileController.php
index a25d0ba2b..f9da65caa 100644
--- a/app/Http/Controllers/Api/Client/Servers/FileController.php
+++ b/app/Http/Controllers/Api/Client/Servers/FileController.php
@@ -77,7 +77,7 @@ class FileController extends ClientApiController
             ->property('file', $request->get('file'))
             ->log();
 
-        return new Response($response, Response::HTTP_OK, ['Content-Type' => 'text/plain; charset=utf-8']);
+        return new Response($response, Response::HTTP_OK, ['Content-Type' => 'text/plain']);
     }
 
     /**
diff --git a/app/Repositories/Daemon/DaemonFileRepository.php b/app/Repositories/Daemon/DaemonFileRepository.php
index d7366ea6d..650d8447a 100644
--- a/app/Repositories/Daemon/DaemonFileRepository.php
+++ b/app/Repositories/Daemon/DaemonFileRepository.php
@@ -53,7 +53,7 @@ class DaemonFileRepository extends DaemonRepository
     {
         $response = $this->getHttpClient()
             ->withQueryParameters(['file' => $path])
-            ->withBody($content, 'text/plain')
+            ->withBody($content)
             ->post("/api/servers/{$this->server->uuid}/files/write");
 
         if ($response->status() === 400) {