diff --git a/backend/src/routes/dashboardRoutes.js b/backend/src/routes/dashboardRoutes.js
index fb54447..5169873 100644
--- a/backend/src/routes/dashboardRoutes.js
+++ b/backend/src/routes/dashboardRoutes.js
@@ -185,6 +185,7 @@ router.get("/hosts", authenticateToken, requireViewHosts, async (_req, res) => {
 			// Show all hosts regardless of status
 			select: {
 				id: true,
+				machine_id: true,
 				friendly_name: true,
 				hostname: true,
 				ip: true,
diff --git a/backend/src/routes/searchRoutes.js b/backend/src/routes/searchRoutes.js
index 077f780..456dde4 100644
--- a/backend/src/routes/searchRoutes.js
+++ b/backend/src/routes/searchRoutes.js
@@ -70,10 +70,12 @@ router.get("/", authenticateToken, async (req, res) => {
 							{ hostname: { contains: searchTerm, mode: "insensitive" } },
 							{ friendly_name: { contains: searchTerm, mode: "insensitive" } },
 							{ ip: { contains: searchTerm, mode: "insensitive" } },
+							{ machine_id: { contains: searchTerm, mode: "insensitive" } },
 						],
 					},
 					select: {
 						id: true,
+						machine_id: true,
 						hostname: true,
 						friendly_name: true,
 						ip: true,
diff --git a/frontend/src/pages/HostDetail.jsx b/frontend/src/pages/HostDetail.jsx
index 8f2b222..4a9e785 100644
--- a/frontend/src/pages/HostDetail.jsx
+++ b/frontend/src/pages/HostDetail.jsx
@@ -387,6 +387,17 @@ const HostDetail = () => {
 											</div>
 										)}
 
+										{host.machine_id && (
+											<div>
+												<p className="text-xs text-secondary-500 dark:text-secondary-300 mb-1.5">
+													Machine ID
+												</p>
+												<p className="font-medium text-secondary-900 dark:text-white font-mono text-sm break-all">
+													{host.machine_id}
+												</p>
+											</div>
+										)}
+
 										<div>
 											<p className="text-xs text-secondary-500 dark:text-secondary-300 mb-1.5">
 												Host Group