diff --git a/src/websocket_client.rs b/src/websocket_client.rs
index dc0a010..55e46ae 100644
--- a/src/websocket_client.rs
+++ b/src/websocket_client.rs
@@ -381,7 +381,13 @@ async fn execute_job(job: AgentJob, result_tx: mpsc::UnboundedSender<SnmpResult>
                             oid_values.insert(oid.clone(), value_to_string(value));
                         }
                         Err(e) => {
-                            crate::log_warn!("SNMP GET failed for OID {}: {}", oid, e);
+                            crate::log_warn!(
+                                "SNMP GET failed for device {} ({}), OID {}: {}",
+                                job.device_id,
+                                snmp_device.ip,
+                                oid,
+                                e
+                            );
                         }
                     }
                 }
@@ -405,7 +411,13 @@ async fn execute_job(job: AgentJob, result_tx: mpsc::UnboundedSender<SnmpResult>
                             }
                         }
                         Err(e) => {
-                            crate::log_warn!("SNMP WALK failed for OID {}: {}", base_oid, e);
+                            crate::log_warn!(
+                                "SNMP WALK failed for device {} ({}), OID {}: {}",
+                                job.device_id,
+                                snmp_device.ip,
+                                base_oid,
+                                e
+                            );
                         }
                     }
                 }