diff --git a/code/modules/mob/living/silicon/robot/drone/drone.dm b/code/modules/mob/living/silicon/robot/drone/drone.dm
index 00f70a7031a..7ad45bd58c0 100644
--- a/code/modules/mob/living/silicon/robot/drone/drone.dm
+++ b/code/modules/mob/living/silicon/robot/drone/drone.dm
@@ -239,7 +239,7 @@
 		health = 35
 		stat = CONSCIOUS
 		return
-	health = 35 - (getBruteLoss() + getFireLoss())
+	health = 35 - (getBruteLoss() + getFireLoss() + getOxyLoss())
 	update_stat("updatehealth([reason])")
 
 /mob/living/silicon/robot/drone/death(gibbed)
diff --git a/code/modules/mob/living/silicon/robot/drone/drone_console.dm b/code/modules/mob/living/silicon/robot/drone/drone_console.dm
index 02924fbbbda..2c09800c1d6 100644
--- a/code/modules/mob/living/silicon/robot/drone/drone_console.dm
+++ b/code/modules/mob/living/silicon/robot/drone/drone_console.dm
@@ -114,7 +114,8 @@
 			var/mob/living/silicon/robot/drone/D = locateUID(params["uid"])
 			if(D)
 				to_chat(usr, "<span class='warning'>You issue a kill command for the unfortunate drone.</span>")
-				message_admins("[key_name_admin(usr)] issued kill order for drone [key_name_admin(D)] from control console.")
+				if(D != usr) // Don't need to bug admins about a suicide
+					message_admins("[key_name_admin(usr)] issued kill order for drone [key_name_admin(D)] from control console.")
 				log_game("[key_name(usr)] issued kill order for [key_name(D)] from control console.")
 				D.shut_down()