diff --git a/src/org/thoughtcrime/securesms/ApplicationPreferencesActivity.java b/src/org/thoughtcrime/securesms/ApplicationPreferencesActivity.java
index 67f679e655..e3da323780 100644
--- a/src/org/thoughtcrime/securesms/ApplicationPreferencesActivity.java
+++ b/src/org/thoughtcrime/securesms/ApplicationPreferencesActivity.java
@@ -382,6 +382,10 @@ public class ApplicationPreferencesActivity extends SherlockPreferenceActivity {
         Log.w("ApplicationPreferencesActivity", nfe);
         return false;
       }
+      
+      if (Integer.parseInt((String)newValue) < 1) {
+        return false;
+      }
 
       preference.setSummary((String)newValue + " " +
                             getString(R.string.ApplicationPreferencesActivity_messages_per_conversation));