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 b9332ebf0..8db5c48c2 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
@@ -388,7 +388,7 @@ public class SearchQueryFragment extends MastodonRecyclerFragment<SearchResultVi
 	}
 
 	private void wrapSuicideDialog(Runnable r){
-		if(!GlobalUserPreferences.showSuicideHelp){
+		if(!GlobalUserPreferences.showSuicideHelp || currentQuery==null){
 			r.run();
 			return;
 		}