diff --git a/resources/views/users/edit.blade.php b/resources/views/users/edit.blade.php
index 2b736d81e..611653d6a 100644
--- a/resources/views/users/edit.blade.php
+++ b/resources/views/users/edit.blade.php
@@ -34,7 +34,9 @@
                         </div>
                     </div>
 
-                    @include('users.parts.language-option-row', ['value' => old('language') ?? $user->getLocale()->appLocale()])
+                    @if(!$user->isGuest())
+                        @include('users.parts.language-option-row', ['value' => old('language') ?? $user->getLocale()->appLocale()])
+                    @endif
                 </div>
 
                 <div class="text-right">
diff --git a/tests/User/UserManagementTest.php b/tests/User/UserManagementTest.php
index 37d9b3835..d92f13f0b 100644
--- a/tests/User/UserManagementTest.php
+++ b/tests/User/UserManagementTest.php
@@ -202,9 +202,13 @@ class UserManagementTest extends TestCase
     public function test_guest_profile_shows_limited_form()
     {
         $guest = $this->users->guest();
+
         $resp = $this->asAdmin()->get('/settings/users/' . $guest->id);
         $resp->assertSee('Guest');
-        $this->withHtml($resp)->assertElementNotExists('#password');
+        $html = $this->withHtml($resp);
+
+        $html->assertElementNotExists('#password');
+        $html->assertElementNotExists('[name="language"]');
     }
 
     public function test_guest_profile_cannot_be_deleted()