diff --git a/src/components/attachment/attachment.js b/src/components/attachment/attachment.js
index 8e959903ae..f4f6aebfdc 100644
--- a/src/components/attachment/attachment.js
+++ b/src/components/attachment/attachment.js
@@ -7,17 +7,19 @@ const Attachment = {
     'nsfw',
     'statusId'
   ],
-  data: () => ({
-    nsfwImage,
-    hideNsfwLocal: this.$store.state.config.hideNsfw,
-    showHidden: !this.hideNsfwLocal
-  }),
+  data () {
+    return {
+      nsfwImage,
+      hideNsfwLocal: this.$store.state.config.hideNsfw,
+      showHidden: false
+    }
+  },
   computed: {
     type () {
       return fileTypeService.fileType(this.attachment.mimetype)
     },
     hidden () {
-      return this.nsfw && !this.showHidden
+      return this.nsfw && this.hideNsfwLocal && !this.showHidden
     }
   },
   methods: {
diff --git a/src/components/attachment/attachment.vue b/src/components/attachment/attachment.vue
index 577f84449f..45cc192906 100644
--- a/src/components/attachment/attachment.vue
+++ b/src/components/attachment/attachment.vue
@@ -1,9 +1,9 @@
 <template>
   <div class="attachment" :class="type">
-    <a class="image-attachment" v-if="hidden && hideNsfwLocal" v-on:click.prevent="toggleHidden()">
+    <a class="image-attachment" v-if="hidden" v-on:click.prevent="toggleHidden()">
       <img :key="nsfwImage" :src="nsfwImage"></img>
     </a>
-    <div class="hider" v-if="nsfw && !hidden && hideNsfwLocal">
+    <div class="hider" v-if="nsfw && hideNsfwLocal && !hidden">
       <a href="#" @click.prevent="toggleHidden()">Hide</a>
     </div>
 
diff --git a/src/components/settings/settings.js b/src/components/settings/settings.js
index 7d58b64cdf..c1b88f823f 100644
--- a/src/components/settings/settings.js
+++ b/src/components/settings/settings.js
@@ -3,7 +3,7 @@ import StyleSwitcher from '../style_switcher/style_switcher.vue'
 const settings = {
   data () {
     return {
-      hideAttachmentsLocal: this.$store.state.config.hideAttachments
+      hideAttachmentsLocal: this.$store.state.config.hideAttachments,
       hideNsfwLocal: this.$store.state.config.hideNsfw
     }
   },
@@ -13,7 +13,7 @@ const settings = {
   watch: {
     hideAttachmentsLocal (value) {
       this.$store.dispatch('setOption', { name: 'hideAttachments', value })
-    }
+    },
     hideNsfwLocal (value) {
       this.$store.dispatch('setOption', { name: 'hideNsfw', value })
     }
diff --git a/src/main.js b/src/main.js
index e553d9aa46..81534caee3 100644
--- a/src/main.js
+++ b/src/main.js
@@ -30,9 +30,9 @@ Vue.use(VueTimeago, {
 
 const persistedStateOptions = {
   paths: ['config.hideAttachments',
-          'config.hideNsfw',
-          'statuses.notifications',
-          'users.users']
+    'config.hideNsfw',
+    'statuses.notifications',
+    'users.users']
 }
 
 const store = new Vuex.Store({