diff --git a/mastodon/src/main/java/org/joinmastodon/android/fragments/discover/SearchQueryFragment.java b/mastodon/src/main/java/org/joinmastodon/android/fragments/discover/SearchQueryFragment.java
index 965ab004c..0f2a7a39d 100644
--- a/mastodon/src/main/java/org/joinmastodon/android/fragments/discover/SearchQueryFragment.java
+++ b/mastodon/src/main/java/org/joinmastodon/android/fragments/discover/SearchQueryFragment.java
@@ -424,6 +424,8 @@ public class SearchQueryFragment extends MastodonRecyclerFragment<SearchResultVi
 	}
 
 	private void onSearchViewEnter(){
+		if(TextUtils.isEmpty(currentQuery) || currentQuery.trim().isEmpty())
+			return;
 		wrapSuicideDialog(()->deliverResult(currentQuery, null));
 	}