diff --git a/briar-android/src/main/java/org/briarproject/briar/android/conversation/ConversationViewModel.java b/briar-android/src/main/java/org/briarproject/briar/android/conversation/ConversationViewModel.java
index c9b3a1cd7..d35c1efcf 100644
--- a/briar-android/src/main/java/org/briarproject/briar/android/conversation/ConversationViewModel.java
+++ b/briar-android/src/main/java/org/briarproject/briar/android/conversation/ConversationViewModel.java
@@ -229,11 +229,15 @@ public class ConversationViewModel extends AndroidViewModel {
 		}
 	}
 
+	@UiThread
 	void onImageOnboardingSeen() {
+		showImageOnboarding.setValue(false);
 		onOnboardingSeen(SHOW_ONBOARDING_IMAGE);
 	}
 
+	@UiThread
 	void onIntroductionOnboardingSeen() {
+		showIntroductionOnboarding.setValue(false);
 		onOnboardingSeen(SHOW_ONBOARDING_INTRODUCTION);
 	}
 
diff --git a/briar-android/src/main/java/org/briarproject/briar/android/view/TextSendController.java b/briar-android/src/main/java/org/briarproject/briar/android/view/TextSendController.java
index 68edf4a12..f0a864afe 100644
--- a/briar-android/src/main/java/org/briarproject/briar/android/view/TextSendController.java
+++ b/briar-android/src/main/java/org/briarproject/briar/android/view/TextSendController.java
@@ -67,7 +67,7 @@ public class TextSendController implements TextInputListener {
 					LENGTH_SHORT).show();
 			return false;
 		}
-		return ready && (canSendEmptyText() || !textInput.isEmpty());
+		return ready && (canSendEmptyText() || !textIsEmpty);
 	}
 
 	protected boolean canSendEmptyText() {