diff --git a/CHANGELOG.rst b/CHANGELOG.rst
index e186961764ed8497e08103c0a2760d2fcd3b9bdf..97f8b01cb0a5010a2fc6aa324770169b18cd77bb 100644
--- a/CHANGELOG.rst
+++ b/CHANGELOG.rst
@@ -41,6 +41,13 @@ Fixed
 * The site logo could overlap with the menu for logos with an unexpected aspect ratio.
 * Some OAuth2 views stopped working with long scope names.
 * Resetting password was impossible due to a missing rule
+* Language selection was broken when only one language was enabled in
+  preferences.
+
+Removed
+~~~~~~~
+
+* Remove option to limit available languages in preferences.
 
 Changed
 ~~~~~~~
diff --git a/aleksis/core/preferences.py b/aleksis/core/preferences.py
index 78b1874356a3a11eab121a56963c9aaf3595d872..230e40686d0782151043723cef9edfffcf5a68b7 100644
--- a/aleksis/core/preferences.py
+++ b/aleksis/core/preferences.py
@@ -333,20 +333,6 @@ class OAuthAllowedGrants(MultipleChoicePreference):
     required = False
 
 
-@site_preferences_registry.register
-class AvailableLanguages(MultipleChoicePreference):
-    """Available languages  of your AlekSIS instance."""
-
-    section = internationalisation
-    name = "languages"
-    default = [code[0] for code in settings.LANGUAGES]
-    widget = SelectMultiple
-    verbose_name = _("Available languages")
-    field_attribute = {"initial": []}
-    choices = settings.LANGUAGES
-    required = True
-
-
 @site_preferences_registry.register
 class DataChecksSendEmails(BooleanPreference):
     """Enable email sending if data checks detect problems."""
diff --git a/aleksis/core/templates/core/partials/language_form.html b/aleksis/core/templates/core/partials/language_form.html
index 197906bb09d6c43d187c63f118261eaf6bbead9e..247dfe386c6dc003e4436415afbf13c34a557612 100644
--- a/aleksis/core/templates/core/partials/language_form.html
+++ b/aleksis/core/templates/core/partials/language_form.html
@@ -8,7 +8,9 @@
   <input name="next" type="hidden" value="{{ request.get_full_path }}">
 
   {% get_current_language as LANGUAGE_CODE %}
-  {% get_language_info_list for request.site.preferences.internationalisation__languages as languages %}
+  {% get_available_languages as LANGUAGES %}
+  {% get_language_info_list for LANGUAGES as languages %}
+
 
   {# Select #}
   <div class="input-field language-field">