diff --git a/app/src/main/java/fr/gouv/etalab/mastodon/activities/TootActivity.java b/app/src/main/java/fr/gouv/etalab/mastodon/activities/TootActivity.java
index 419e7fc35..39312460f 100644
--- a/app/src/main/java/fr/gouv/etalab/mastodon/activities/TootActivity.java
+++ b/app/src/main/java/fr/gouv/etalab/mastodon/activities/TootActivity.java
@@ -46,7 +46,6 @@ import android.text.Html;
 import android.text.InputFilter;
 import android.text.InputType;
 import android.text.TextWatcher;
-import android.util.Log;
 import android.view.LayoutInflater;
 import android.view.Menu;
 import android.view.MenuItem;
@@ -772,6 +771,8 @@ public class TootActivity extends AppCompatActivity implements OnRetrieveSearcAc
                 }else {
                     picker.setStyle(R.style.AppThemeDark, R.style.AlertDialogDark);
                 }
+                if( toot_content.getText().length() == 0 && toot_cw_content.getText().length() == 0)
+                    return true;
                 picker.setListener(new CountryPickerListener() {
                     @SuppressLint("InflateParams")
                     @Override