diff --git a/backend/server/db/mdm.ts b/backend/server/db/mdm.ts
index 2d42366..259c14b 100644
--- a/backend/server/db/mdm.ts
+++ b/backend/server/db/mdm.ts
@@ -157,10 +157,12 @@ export async function getMdmStatusByUdid(
     token_update_at: Date | null;
     last_ack: Date | null;
     last_app_push_at: Date | null;
+    enrolled: boolean;
   }>(
     `SELECT
       d.unlock_token,
       d.token_update_at,
+      COALESCE(e.enabled = TRUE, FALSE) AS enrolled,
       (SELECT max(updated_at) FROM command_results WHERE id = d.id) AS last_ack,
       (SELECT max(r.updated_at)
        FROM command_results r
@@ -169,12 +171,13 @@ export async function getMdmStatusByUdid(
          AND c.request_type = 'InstallApplication'
          AND r.status = 'Acknowledged') AS last_app_push_at
      FROM devices d
+     LEFT JOIN enrollments e ON e.device_id = d.id
      WHERE d.id = $1`,
     [udid],
   );
 
   const row = result.rows[0];
-  const enrolled = !!row;
+  const enrolled = row?.enrolled ?? false;
 
   return {
     enrolled,