diff --git a/src/General/Build.coffee b/src/General/Build.coffee
index c225fa3f0..03cfaa9b1 100644
--- a/src/General/Build.coffee
+++ b/src/General/Build.coffee
@@ -264,6 +264,8 @@ Build =
       className: 'thread'
       id: "t#{data.no}"
 
+    Build.spoilerRange[board] = data.custom_spoiler
+
     for obj in [data].concat data.last_replies or []
       $.add root, if post = g.posts["#{board}.#{obj.no}"]
         post.nodes.root
diff --git a/src/Miscellaneous/ExpandComment.coffee b/src/Miscellaneous/ExpandComment.coffee
index 103c891e5..12fee2935 100644
--- a/src/Miscellaneous/ExpandComment.coffee
+++ b/src/Miscellaneous/ExpandComment.coffee
@@ -32,8 +32,7 @@ ExpandComment =
       return
 
     posts = JSON.parse(req.response).posts
-    if spoilerRange = posts[0].custom_spoiler
-      Build.spoilerRange[g.BOARD] = spoilerRange
+    Build.spoilerRange[g.BOARD] = posts[0].custom_spoiler
 
     for postObj in posts
       break if postObj.no is post.ID