diff --git a/controllers/forms.js b/controllers/forms.js
index b14ed148..cf31baa2 100644
--- a/controllers/forms.js
+++ b/controllers/forms.js
@@ -10,7 +10,8 @@ const express  = require('express')
 	, Mongo = require(__dirname+'/../db/db.js')
 	, remove = require('fs-extra').remove
 	, deletePosts = require(__dirname+'/../models/forms/delete-post.js')
-	, dismissGlobaReports = require(__dirname+'/../models/forms/dismissglobalreport.js')
+	, spoilerPosts = require(__dirname+'/../models/forms/spoiler-post.js')
+	, dismissGlobalReports = require(__dirname+'/../models/forms/dismissglobalreport.js')
 	, banPoster = require(__dirname+'/../models/forms/ban-poster.js')
 	, removeBans = require(__dirname+'/../models/forms/removebans.js')
 	, makePost = require(__dirname+'/../models/forms/make-post.js')
@@ -469,7 +470,13 @@ router.post('/global/actions', csrf, checkPermsMiddleware, paramConverter, async
 					combinedQuery[action] = { ...combinedQuery[action], ...query}
 				}
 				messages.push(message);
-			}
+			} else if (req.body.spoiler) {
+                const { message, action, query } = spoilerPosts(posts);
+                if (action) {
+                    combinedQuery[action] = { ...combinedQuery[action], ...query}
+                }
+                messages.push(message);
+            }
 			if (req.body.global_dismiss) {
 				const { message, action, query } = dismissGlobalReports(posts);
 				if (action) {
diff --git a/models/forms/spoiler-post.js b/models/forms/spoiler-post.js
index f974b492..121816a3 100644
--- a/models/forms/spoiler-post.js
+++ b/models/forms/spoiler-post.js
@@ -4,12 +4,12 @@ module.exports = (posts) => {
 
 	// filter to ones not spoilered
 	const filteredPosts = posts.filter(post => {
-  		return !post.spoiler
+  		return !post.spoiler && post.files.length > 0;
 	});
 
 	if (filteredPosts.length === 0) {
 		return {
-			message:'Post(s) already spoilered'
+			message:'No post(s) to spoiler'
 		};
 	}