diff --git a/frontend/src/devices/DeviceDetail.jsx b/frontend/src/devices/DeviceDetail.jsx
index eec360c..9d972d3 100644
--- a/frontend/src/devices/DeviceDetail.jsx
+++ b/frontend/src/devices/DeviceDetail.jsx
@@ -380,6 +380,7 @@ export default function DeviceDetail() {
         api.get("/mqtt/status").catch(() => null),
       ]);
       setDevice(d);
+      if (d.staffNotes) setStaffNotes(d.staffNotes);
 
       // Match MQTT status by serial number
       if (mqttData?.devices && d.device_id) {
@@ -460,11 +461,6 @@ export default function DeviceDetail() {
 
   // ===== Section definitions =====
 
-  // Initialize staffNotes from device data once loaded
-  useEffect(() => {
-    if (device?.staffNotes) setStaffNotes(device.staffNotes);
-  }, [device]);
-
   const saveStaffNotes = async (value) => {
     setSavingNotes(true);
     try {