diff --git a/tbsetup/assign_wrapper.in b/tbsetup/assign_wrapper.in
index d7b5c0771d1d6b0fc91434774598cb03a924d1d2..fcfd73859fbbc98f081fb8a62f7dad6fa10b3d9c 100644
--- a/tbsetup/assign_wrapper.in
+++ b/tbsetup/assign_wrapper.in
@@ -3106,7 +3106,8 @@ sub InitPnode($$)
 	$inner_elab_role = virtnodeelabrole($vnode);
 	$plab_role = virtnodeplabrole($vnode);
 
-	if ((!defined($cmdline) || $cmdline eq "")) {
+	if (!physnodeisvirtnode($pnode) &&
+	    (!defined($cmdline) || $cmdline eq "")) {
 	    # If the user hasn't overridden the command line, try to find a
 	    # default for this OSID.
 	    if (virtnodeneedslinkdelays($vnode)) {