diff --git a/arduino/discovery/discovery.go b/arduino/discovery/discovery.go
index 1b55d82a0d0..78956a63331 100644
--- a/arduino/discovery/discovery.go
+++ b/arduino/discovery/discovery.go
@@ -162,6 +162,7 @@ func (disc *PluggableDiscovery) jsonDecodeLoop(in io.Reader, outChan chan<- *dis
 			// This is fine, we exit gracefully
 			disc.statusMutex.Lock()
 			disc.state = Dead
+			disc.incomingMessagesError = err
 			disc.statusMutex.Unlock()
 			close(outChan)
 			return