diff --git a/mastodon/src/main/java/org/joinmastodon/android/model/Poll.java b/mastodon/src/main/java/org/joinmastodon/android/model/Poll.java
index 26e1c5900..037a1115b 100644
--- a/mastodon/src/main/java/org/joinmastodon/android/model/Poll.java
+++ b/mastodon/src/main/java/org/joinmastodon/android/model/Poll.java
@@ -49,7 +49,7 @@ public class Poll extends BaseModel{
 	}
 
 	public boolean isExpired(){
-		return expired || expiresAt.isBefore(Instant.now());
+		return expired || (expiresAt!=null && expiresAt.isBefore(Instant.now()));
 	}
 
 	@Parcel