diff --git a/code/modules/mob/living/silicon/robot/drone/drone_manufacturer.dm b/code/modules/mob/living/silicon/robot/drone/drone_manufacturer.dm
index 68a5546e4da..f9dbce1c52f 100644
--- a/code/modules/mob/living/silicon/robot/drone/drone_manufacturer.dm
+++ b/code/modules/mob/living/silicon/robot/drone/drone_manufacturer.dm
@@ -117,9 +117,16 @@
 	var/deathtimeseconds = round((deathtime - deathtimeminutes * 600) / 10,1)
 
 	if (deathtime < 6000)
-		usr << "You have been dead for[pluralcheck] [deathtimeseconds] seconds."
-		usr << "You must wait 10 minutes to respawn as a drone!"
-		return
+		if(istype(src,/mob/dead/observer))
+			var/mob/dead/observer/O = src	
+			if(O.started_as_observer == 0)
+				usr << "You have been dead for[pluralcheck] [deathtimeseconds] seconds."
+				usr << "You must wait 10 minutes to respawn as a drone!"
+				return			
+		else
+			usr << "You have been dead for[pluralcheck] [deathtimeseconds] seconds."
+			usr << "You must wait 10 minutes to respawn as a drone!"
+			return
 
 	for(var/obj/machinery/drone_fabricator/DF in world)
 		if(DF.stat & NOPOWER || !DF.produce_drones)