diff --git a/ring-android/app/src/main/java/cx/ring/client/ConversationActivity.java b/ring-android/app/src/main/java/cx/ring/client/ConversationActivity.java
index 1e3f315f91c01a72d46bb2dcc4e885f35ce3a0f4..b098929e97f18a2c23e50b6c51089eb33a4c24a9 100644
--- a/ring-android/app/src/main/java/cx/ring/client/ConversationActivity.java
+++ b/ring-android/app/src/main/java/cx/ring/client/ConversationActivity.java
@@ -193,8 +193,11 @@ public class ConversationActivity extends AppCompatActivity {
             public boolean onEditorAction(TextView v, int actionId, KeyEvent event) {
                 switch (actionId) {
                     case EditorInfo.IME_ACTION_SEND:
-                        onSendTextMessage(msgEditTxt.getText().toString());
-                        msgEditTxt.setText("");
+                        CharSequence txt = msgEditTxt.getText();
+                        if (txt.length() > 0) {
+                            onSendTextMessage(msgEditTxt.getText().toString());
+                            msgEditTxt.setText("");
+                        }
                         return true;
                 }
                 return false;
@@ -204,8 +207,11 @@ public class ConversationActivity extends AppCompatActivity {
         msgSendBtn.setOnClickListener(new View.OnClickListener() {
             @Override
             public void onClick(View v) {
-                onSendTextMessage(msgEditTxt.getText().toString());
-                msgEditTxt.setText("");
+                CharSequence txt = msgEditTxt.getText();
+                if (txt.length() > 0) {
+                    onSendTextMessage(txt.toString());
+                    msgEditTxt.setText("");
+                }
             }
         });
         bottomPane = (ViewGroup) findViewById(R.id.ongoingcall_pane);