diff --git a/utils/node_statewait.in b/utils/node_statewait.in
index d6c0c70cf58e85cffcaf032b2c82671344e816db..1af57379dccab030fee84f75e82e86a7986b16c2 100644
--- a/utils/node_statewait.in
+++ b/utils/node_statewait.in
@@ -20,7 +20,6 @@ sub usage()
 }
 my $optlist = "at:s:";
 my $timeout = 60 * 6;
-my $state   = TBDB_NODESTATE_PXEWAIT;
 
 #
 # Configure variables
@@ -30,6 +29,7 @@ my $TB		= "@prefix@";
 # Locals
 my @nodes       = ();
 my $failed      = 0;
+my $state;
 
 #
 # Load the Testbed support stuff. 
@@ -55,6 +55,9 @@ if (defined($options{"t"})) {
 if (defined($options{"s"})) {
     $state = $options{"s"};
 }
+else {
+    $state = TBDB_NODESTATE_PXEWAIT;
+}
 
 #
 # All testnodes, or just some nodes.