diff --git a/mastodon/src/main/java/org/joinmastodon/android/ui/viewcontrollers/ComposeAutocompleteViewController.java b/mastodon/src/main/java/org/joinmastodon/android/ui/viewcontrollers/ComposeAutocompleteViewController.java
index cfbc1cae2..7e4cefd6d 100644
--- a/mastodon/src/main/java/org/joinmastodon/android/ui/viewcontrollers/ComposeAutocompleteViewController.java
+++ b/mastodon/src/main/java/org/joinmastodon/android/ui/viewcontrollers/ComposeAutocompleteViewController.java
@@ -192,7 +192,13 @@ public class ComposeAutocompleteViewController{
 			Hashtag tag=new Hashtag();
 			tag.name=lastText.substring(1);
 			hashtags.add(tag);
-			UiUtils.updateList(oldList, hashtags, list, hashtagsAdapter, (t1, t2)->t1.name.equals(t2.name));
+			UiUtils.updateList(oldList, hashtags, list, hashtagsAdapter, (t1, t2)->{
+				if(t1 != null && t2 != null)
+					return t1.name.equals(t2.name);
+				else {
+					return false;
+				}
+			});
 
 			list.postDelayed(hashtagsDebouncer, 300);
 		}else if(mode==Mode.EMOJIS){