diff --git a/code/modules/admin/verbs/massmodvar.dm b/code/modules/admin/verbs/massmodvar.dm
index 3358920873..72eb84dcda 100644
--- a/code/modules/admin/verbs/massmodvar.dm
+++ b/code/modules/admin/verbs/massmodvar.dm
@@ -27,6 +27,11 @@
 		src << "Only administrators may use this command."
 		return
 
+	for(var/p in forbidden_varedit_object_types)
+		if( istype(O,p) )
+			usr << "\red It is forbidden to edit this object's variables."
+			return
+
 	var/list/names = list()
 	for (var/V in O.vars)
 		names += V
diff --git a/code/modules/admin/verbs/modifyvariables.dm b/code/modules/admin/verbs/modifyvariables.dm
index d4dbaa1f34..a14154bccc 100644
--- a/code/modules/admin/verbs/modifyvariables.dm
+++ b/code/modules/admin/verbs/modifyvariables.dm
@@ -1,3 +1,9 @@
+var/list/forbidden_varedit_object_types = list(
+										/obj/admins,						//Admins editing their own admin-power object? Yup, sounds like a good idea.
+										/obj/machinery/blackbox_recorder,	//Prevents people messing with feedback gathering
+										/datum/feedback_variable			//Prevents people messing with feedback gathering
+									)
+
 /client/proc/cmd_modify_object_variables(obj/O as obj|mob|turf|area in world)
 	set category = "Debug"
 	set name = "Edit Variables"
@@ -267,13 +273,7 @@
 		src << "Only administrators may use this command."
 		return
 
-	var/list/forbidden_object_types = list(
-											/obj/admins,						//Admins editing their own admin-power object? Yup, sounds like a good idea.
-											/obj/machinery/blackbox_recorder,	//Prevents people messing with feedback gathering
-											/datum/feedback_variable			//Prevents people messing with feedback gathering
-										)
-
-	for(var/p in forbidden_object_types)
+	for(var/p in forbidden_varedit_object_types)
 		if( istype(O,p) )
 			usr << "\red It is forbidden to edit this object's variables."
 			return