diff --git a/commands/service_board_list.go b/commands/service_board_list.go
index a5376cb9f1f..44e89fdc8dd 100644
--- a/commands/service_board_list.go
+++ b/commands/service_board_list.go
@@ -318,5 +318,6 @@ func (s *arduinoCoreServerImpl) BoardListWatch(req *rpc.BoardListWatchRequest, s
 		}
 	}()
 
+	<-stream.Context().Done()
 	return nil
 }