diff --git a/Changes b/Changes
index 3cc58141b..079492465 100644
--- a/Changes
+++ b/Changes
@@ -36,6 +36,8 @@ remoteinventory:
 netdiscovery/netinventory:
 * fix #768: Added Aerohive devices support
 * fix #769: Added Intelbras devices support
+* don't send discovery xml to server target for remoteinventory task event initiated
+  from toolbox
 
 deploy:
 * Fix checks on command run and clarify reason of success or failure. This fixes
diff --git a/lib/GLPI/Agent/Task/NetDiscovery.pm b/lib/GLPI/Agent/Task/NetDiscovery.pm
index a97d626a8..135b96be4 100644
--- a/lib/GLPI/Agent/Task/NetDiscovery.pm
+++ b/lib/GLPI/Agent/Task/NetDiscovery.pm
@@ -408,7 +408,9 @@ sub run {
                     }
                 }
 
-                $self->_sendResultMessage($result, $jobid);
+                # Don't send xml discovery inventory to server on computer remote inventory
+                $self->_sendResultMessage($result, $jobid)
+                    unless $authremote && $self->{target}->isType('server');
 
                 # Eventually chain with netinventory when requested
                 if ($job->netscan) {