diff --git a/bin/netdisco-do b/bin/netdisco-do
index 6f824282..3e063d90 100755
--- a/bin/netdisco-do
+++ b/bin/netdisco-do
@@ -134,7 +134,7 @@ foreach my $host (@hostlist) {
     action => $action,
     device => $dev,
     port   => $port,
-    subaction => $extra,
+    subaction => ($extra || (($action eq 'discover') ? 'with-nodes' : undef)),
     username => ($ENV{USER} || 'netdisco-do'),
   };
 }