diff --git a/CHANGELOG.md b/CHANGELOG.md
index b6563eb0a..3b2aea9c8 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,4 @@
+- Fix QR remembering the file spoiler state when it shouldn't, for real this time.
 - Fix inputs in the `Rice` tab being empty when `Custom Board Navigation` is disabled.
 
 ### 3.1.3 - *2013-04-16*
diff --git a/src/qr.coffee b/src/qr.coffee
index 30c6b0a84..f64c88a37 100644
--- a/src/qr.coffee
+++ b/src/qr.coffee
@@ -78,8 +78,6 @@ QR =
       QR.posts[0].rm()
     QR.cooldown.auto = false
     QR.status()
-    if !Conf['Remember Spoiler'] and QR.nodes.spoiler.checked
-      QR.nodes.spoiler.click()
   focusin: ->
     $.addClass QR.nodes.el, 'has-focus'
   focusout: ->
@@ -563,7 +561,7 @@ QR =
       if @file
         QR.nodes.filename.textContent = @filename
         QR.nodes.filename.title       = @filename
-        QR.nodes.spoiler.checked      = @spoiler if QR.spoiler
+        QR.nodes.spoiler.checked      = @spoiler
         $.addClass QR.nodes.fileSubmit, 'has-file'
       else
         $.rmClass QR.nodes.fileSubmit, 'has-file'