diff --git a/mastodon/src/main/java/org/joinmastodon/android/fragments/ComposeFragment.java b/mastodon/src/main/java/org/joinmastodon/android/fragments/ComposeFragment.java
index b6e5ad690..2ea1472c5 100644
--- a/mastodon/src/main/java/org/joinmastodon/android/fragments/ComposeFragment.java
+++ b/mastodon/src/main/java/org/joinmastodon/android/fragments/ComposeFragment.java
@@ -667,7 +667,7 @@ public class ComposeFragment extends MastodonToolbarFragment implements OnBackPr
 		languageButton.setCompoundDrawableTintList(languageButton.getTextColors());
 		languageButton.setCompoundDrawablePadding(V.dp(6));
 
-		updateLanguage(languageResolver.getDefault());
+		updateLanguage(languageResolver.getDefault(accountID));
 		languagePopup=new PopupMenu(getActivity(), languageButton);
 		languageButton.setOnTouchListener(languagePopup.getDragToOpenListener());
 		languageButton.setOnClickListener(v->languagePopup.show());
diff --git a/mastodon/src/main/java/org/joinmastodon/android/utils/MastodonLanguage.java b/mastodon/src/main/java/org/joinmastodon/android/utils/MastodonLanguage.java
index 357cab3e3..ebd34362e 100644
--- a/mastodon/src/main/java/org/joinmastodon/android/utils/MastodonLanguage.java
+++ b/mastodon/src/main/java/org/joinmastodon/android/utils/MastodonLanguage.java
@@ -95,11 +95,7 @@ public class MastodonLanguage {
 		}
 
 		public MastodonLanguage getDefault(String accountID) {
-			if(GlobalUserPreferences.defaultLanguages.get(accountID)==null){
-				GlobalUserPreferences.defaultLanguages.put(accountID, Locale.getDefault().getLanguage());
-				return from(Locale.getDefault().getLanguage());
-			}
-			return from(GlobalUserPreferences.defaultLanguages.get(accountID));
+
 		}
 	}
 }