diff --git a/mastodon/src/main/java/org/joinmastodon/android/model/Status.java b/mastodon/src/main/java/org/joinmastodon/android/model/Status.java
index 457607a6d..bee514d18 100644
--- a/mastodon/src/main/java/org/joinmastodon/android/model/Status.java
+++ b/mastodon/src/main/java/org/joinmastodon/android/model/Status.java
@@ -96,7 +96,7 @@ public class Status extends BaseModel implements DisplayItemsParent{
 				fr.postprocess();
 		}
 
-		if(!sensitive){
+		if(!sensitive && (reblog==null || !reblog.sensitive)){
 			revealedSpoilers.add(SpoilerType.CONTENT_WARNING);
 		}
 	}