diff --git a/code/controllers/subsystems/inactivity.dm b/code/controllers/subsystems/inactivity.dm
index 7e97939fff..eb47935a76 100644
--- a/code/controllers/subsystems/inactivity.dm
+++ b/code/controllers/subsystems/inactivity.dm
@@ -15,8 +15,12 @@ SUBSYSTEM_DEF(inactivity)
 	while(client_list.len)
 		var/client/C = client_list[client_list.len]
 		client_list.len--
+<<<<<<< HEAD
 		if(!C.holder && C.is_afk(config.kick_inactive MINUTES) && !isobserver(C.mob))
 			
+=======
+		if(C.is_afk(config.kick_inactive MINUTES) && can_kick(C))
+>>>>>>> 253e371... Inactivity subsystem kicks ghosts and admins again (#6886)
 			to_chat(C, "<span class='warning'>You have been inactive for more than [config.kick_inactive] minute\s and have been disconnected.</span>")
 
 			var/information
@@ -34,6 +38,9 @@ SUBSYSTEM_DEF(inactivity)
 					if(job)
 						information = " while [job]."
 
+				else if(isobserver(C.mob))
+					information = " while a ghost."
+
 				else if(issilicon(C.mob))
 					information = " while a silicon."
 					if(isAI(C.mob))
@@ -56,3 +63,9 @@ SUBSYSTEM_DEF(inactivity)
 
 /datum/controller/subsystem/inactivity/stat_entry()
 	..("Kicked: [number_kicked]")
+<<<<<<< HEAD
+=======
+
+/datum/controller/subsystem/inactivity/proc/can_kick(var/client/C)
+	return TRUE
+>>>>>>> 253e371... Inactivity subsystem kicks ghosts and admins again (#6886)