diff --git a/code/_onclick/hud/screen_objects.dm b/code/_onclick/hud/screen_objects.dm
index 88894fa8b9c..7406307c632 100644
--- a/code/_onclick/hud/screen_objects.dm
+++ b/code/_onclick/hud/screen_objects.dm
@@ -276,6 +276,9 @@
 						if(!istype(C.wear_mask, /obj/item/clothing/mask))
 							C << "<span class='notice'>You are not wearing a mask.</span>"
 							return 1
+						if(C.wear_mask.mask_adjusted)
+							C << "<span class='notice'>Put your mask on first.</span>"
+							return 1						
 						else
 							var/list/nicename = null
 							var/list/tankcheck = null
diff --git a/code/modules/clothing/clothing.dm b/code/modules/clothing/clothing.dm
index fd1067f51c1..8c79383cc1a 100644
--- a/code/modules/clothing/clothing.dm
+++ b/code/modules/clothing/clothing.dm
@@ -267,6 +267,12 @@ BLIND     // can't see anything
 			src.mask_adjusted = 1
 			if(adjusted_flags)
 				slot_flags = adjusted_flags
+			if(ishuman(user))
+				var/mob/living/carbon/human/H = user
+				if(H.internal)
+					if(H.internals)
+						H.internals.icon_state = "internal0"
+					H.internal = null
 		usr.update_inv_wear_mask()
 
 //Shoes