diff --git a/android/app/src/main/java/com/mattermost/share/ShareModule.java b/android/app/src/main/java/com/mattermost/share/ShareModule.java
index 218ab7309..73a0e7ff1 100644
--- a/android/app/src/main/java/com/mattermost/share/ShareModule.java
+++ b/android/app/src/main/java/com/mattermost/share/ShareModule.java
@@ -194,8 +194,12 @@ public class ShareModule extends ReactContextBaseJavaModule {
         JSONObject json = new JSONObject();
         try {
             json.put("user_id", data.getString("currentUserId"));
-            json.put("channel_id", data.getString("channelId"));
-            json.put("message", data.getString("value"));
+            if (data.hasKey("channel_id")) {
+                json.put("channel_id", data.getString("channelId"));
+            }
+            if (data.hasKey("value")) {
+                json.put("message", data.getString("value"));
+            }
         } catch (JSONException e) {
             e.printStackTrace();
         }