diff --git a/src/org/thoughtcrime/securesms/preferences/AppearancePreferenceFragment.java b/src/org/thoughtcrime/securesms/preferences/AppearancePreferenceFragment.java
index ffe24748c5..09f9840772 100644
--- a/src/org/thoughtcrime/securesms/preferences/AppearancePreferenceFragment.java
+++ b/src/org/thoughtcrime/securesms/preferences/AppearancePreferenceFragment.java
@@ -50,6 +50,9 @@ public class AppearancePreferenceFragment extends ListSummaryPreferenceFragment
     int langIndex  = Arrays.asList(languageEntryValues).indexOf(TextSecurePreferences.getLanguage(context));
     int themeIndex = Arrays.asList(themeEntryValues).indexOf(TextSecurePreferences.getTheme(context));
 
+    if (langIndex == -1)  langIndex = 0;
+    if (themeIndex == -1) themeIndex = 0;
+
     return context.getString(R.string.preferences__theme_summary,    themeEntries[themeIndex]) + ", " +
            context.getString(R.string.preferences__language_summary, languageEntries[langIndex]);
   }