diff --git a/app/src/main/java/eu/faircode/email/EditTextMultiAutoComplete.java b/app/src/main/java/eu/faircode/email/EditTextMultiAutoComplete.java
index b851f6ed0f..3aededf82b 100644
--- a/app/src/main/java/eu/faircode/email/EditTextMultiAutoComplete.java
+++ b/app/src/main/java/eu/faircode/email/EditTextMultiAutoComplete.java
@@ -330,7 +330,7 @@ public class EditTextMultiAutoComplete extends AppCompatMultiAutoCompleteTextVie
             try {
                 final Context context = getContext();
                 final Editable edit = getText();
-                final boolean send_chips = prefs.getBoolean("send_chips", false);
+                final boolean send_chips = prefs.getBoolean("send_chips", !BuildConfig.PLAY_STORE_RELEASE);
 
                 final boolean focus = hasFocus();
                 final int selStart = getSelectionStart();
diff --git a/app/src/main/java/eu/faircode/email/FragmentCompose.java b/app/src/main/java/eu/faircode/email/FragmentCompose.java
index 89fa7e5cb7..12b318bb06 100644
--- a/app/src/main/java/eu/faircode/email/FragmentCompose.java
+++ b/app/src/main/java/eu/faircode/email/FragmentCompose.java
@@ -1609,7 +1609,7 @@ public class FragmentCompose extends FragmentBase {
 
         SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(context);
         boolean save_drafts = prefs.getBoolean("save_drafts", true);
-        boolean send_chips = prefs.getBoolean("send_chips", false);
+        boolean send_chips = prefs.getBoolean("send_chips", !BuildConfig.PLAY_STORE_RELEASE);
         boolean send_dialog = prefs.getBoolean("send_dialog", true);
         boolean image_dialog = prefs.getBoolean("image_dialog", true);
 
@@ -1806,7 +1806,7 @@ public class FragmentCompose extends FragmentBase {
 
     private void onMenuSendChips() {
         SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(getContext());
-        boolean send_chips = prefs.getBoolean("send_chips", false);
+        boolean send_chips = prefs.getBoolean("send_chips", !BuildConfig.PLAY_STORE_RELEASE);
         prefs.edit().putBoolean("send_chips", !send_chips).apply();
 
         etTo.setText(etTo.getText());
diff --git a/app/src/main/java/eu/faircode/email/FragmentOptionsSend.java b/app/src/main/java/eu/faircode/email/FragmentOptionsSend.java
index 20c0791784..801a3f5285 100644
--- a/app/src/main/java/eu/faircode/email/FragmentOptionsSend.java
+++ b/app/src/main/java/eu/faircode/email/FragmentOptionsSend.java
@@ -571,7 +571,7 @@ public class FragmentOptionsSend extends FragmentBase implements SharedPreferenc
         rgRe.check(prefs.getBoolean("alt_re", false) ? R.id.rbRe2 : R.id.rbRe1);
         rgFwd.check(prefs.getBoolean("alt_fwd", false) ? R.id.rbFwd2 : R.id.rbFwd1);
 
-        swSendChips.setChecked(prefs.getBoolean("send_chips", false));
+        swSendChips.setChecked(prefs.getBoolean("send_chips", !BuildConfig.PLAY_STORE_RELEASE));
         swSendReminders.setChecked(prefs.getBoolean("send_reminders", true));
 
         int send_delayed = prefs.getInt("send_delayed", 0);