diff --git a/4chan_x.user.js b/4chan_x.user.js
index dec2ce93d..1523faecd 100644
--- a/4chan_x.user.js
+++ b/4chan_x.user.js
@@ -1262,7 +1262,9 @@
       qr.cooldown.auto = false;
       qr.status();
       qr.resetFileInput();
-      if ((spoiler = $.id('spoiler')).checked) spoiler.click();
+      if (!conf['Remember Spoiler'] && (spoiler = $.id('spoiler')).checked) {
+        spoiler.click();
+      }
       return qr.cleanError();
     },
     hide: function() {
diff --git a/script.coffee b/script.coffee
index b2669e27c..b9d692f04 100644
--- a/script.coffee
+++ b/script.coffee
@@ -922,7 +922,8 @@ qr =
     qr.cooldown.auto = false
     qr.status()
     qr.resetFileInput()
-    spoiler.click() if (spoiler = $.id 'spoiler').checked
+    if not conf['Remember Spoiler'] and (spoiler = $.id 'spoiler').checked
+      spoiler.click()
     qr.cleanError()
   hide: ->
     d.activeElement.blur()