diff --git a/code/modules/mechs/mech_interaction.dm b/code/modules/mechs/mech_interaction.dm
index 1b26188a0a9ef..de7c67d00be1d 100644
--- a/code/modules/mechs/mech_interaction.dm
+++ b/code/modules/mechs/mech_interaction.dm
@@ -448,18 +448,6 @@
 		)
 		return TRUE
 
-	// Robot Analyzer - Scan mech
-	if (istype(tool, /obj/item/device/robotanalyzer))
-		user.visible_message(
-			SPAN_NOTICE("\The [user] scans \the [src] with \a [tool]."),
-			SPAN_NOTICE("You scan \the [src] with \the [tool].")
-		)
-		to_chat(user, SPAN_INFO("Diagnostic Report for \the [src]:"))
-		for (var/obj/item/mech_component/component in list(arms, legs, body, head))
-			if (component)
-				component.return_diagnostics(user)
-		return TRUE
-
 	// Screwdriver - Remove cell
 	if (isScrewdriver(tool))
 		if (!maintenance_protocols)
diff --git a/code/modules/mob/living/silicon/robot/analyzer.dm b/code/modules/mob/living/silicon/robot/analyzer.dm
index f89fdc473f68f..062a795da6eb3 100644
--- a/code/modules/mob/living/silicon/robot/analyzer.dm
+++ b/code/modules/mob/living/silicon/robot/analyzer.dm
@@ -33,6 +33,8 @@
 		scan_type = "robot"
 	else if(istype(M, /mob/living/carbon/human))
 		scan_type = "prosthetics"
+	else if (istype(M, /mob/living/exosuit))
+		scan_type = "exosuit"
 	else
 		to_chat(user, SPAN_WARNING("You can't analyze non-robotic things!"))
 		return
@@ -110,6 +112,13 @@
 			if(!organ_found)
 				to_chat(user, "No prosthetics located.")
 
+		if ("exosuit")
+			var/mob/living/exosuit/mech = M
+			to_chat(user, SPAN_INFO("Diagnostic Report for \the [M]:"))
+			for (var/obj/item/mech_component/component in list(mech.arms, mech.legs, mech.body, mech.head))
+				if (component)
+					component.return_diagnostics(user)
+
 	playsound(user,'sound/effects/scanbeep.ogg', 30)
 	return