diff --git a/mastodon/src/main/java/org/joinmastodon/android/api/session/AccountSession.java b/mastodon/src/main/java/org/joinmastodon/android/api/session/AccountSession.java
index 1ecac98f6..3aebcd1ad 100644
--- a/mastodon/src/main/java/org/joinmastodon/android/api/session/AccountSession.java
+++ b/mastodon/src/main/java/org/joinmastodon/android/api/session/AccountSession.java
@@ -315,6 +315,9 @@ public class AccountSession{
 			return true;
 		// Even with server-side filters, clients are expected to remove statuses that match a filter that hides them
 		if(getLocalPreferences().serverSideFiltersSupported){
+			// Moshidon: this code path in CustomLocalTimelines makes the app crash, so this check is here
+			if (s.filtered == null)
+				return false;
 			for(FilterResult filter : s.filtered){
 				if(filter.filter.isActive() && filter.filter.filterAction==FilterAction.HIDE && filter.filter.context.contains(context))
 					return true;