diff --git a/src/common/common/defaults.h b/src/common/common/defaults.h
index 17d761d7..a061be66 100644
--- a/src/common/common/defaults.h
+++ b/src/common/common/defaults.h
@@ -24,7 +24,7 @@
  * The default number of seconds to wait after sending the Wake-on-LAN packet
  * for the destination host to start responding.
  */
-#define GUAC_WOL_DEFAULT_BOOT_WAIT_TIME 60
+#define GUAC_WOL_DEFAULT_BOOT_WAIT_TIME 0
 
 
 #endif /* GUAC_COMMON_DEFAULTS_H */
diff --git a/src/protocols/rdp/settings.c b/src/protocols/rdp/settings.c
index 381ec303..307c83ba 100644
--- a/src/protocols/rdp/settings.c
+++ b/src/protocols/rdp/settings.c
@@ -612,7 +612,8 @@ enum RDP_ARGS_IDX {
      * The amount of time, in seconds, to wait after sending the WoL packet
      * before attempting to connect to the host.  This should be a reasonable
      * amount of time to allow the remote host to fully boot and respond to
-     * network connection requests.  The default amount of time is 60 seconds.
+     * network connection requests.  The default is not to wait at all
+     * (0 seconds).
      */
     IDX_WOL_WAIT_TIME,
 
diff --git a/src/protocols/ssh/settings.c b/src/protocols/ssh/settings.c
index 9539d033..edad700c 100644
--- a/src/protocols/ssh/settings.c
+++ b/src/protocols/ssh/settings.c
@@ -318,7 +318,8 @@ enum SSH_ARGS_IDX {
     
     /**
      * The amount of time to wait after sending the magic WoL packet prior to
-     * continuing the connection attempt.
+     * continuing the connection attempt.  The default is no wait time
+     * (0 seconds).
      */
     IDX_WOL_WAIT_TIME,
 
diff --git a/src/protocols/telnet/settings.c b/src/protocols/telnet/settings.c
index 8b537de4..d51d4406 100644
--- a/src/protocols/telnet/settings.c
+++ b/src/protocols/telnet/settings.c
@@ -259,7 +259,8 @@ enum TELNET_ARGS_IDX {
     
     /**
      * The amount of time, in seconds, to wait after the magic WoL packet is
-     * sent before continuing the connection attempt.
+     * sent before continuing the connection attempt.  The default is not to
+     * wait at all (0 seconds).
      */
     IDX_WOL_WAIT_TIME,
 
diff --git a/src/protocols/vnc/settings.c b/src/protocols/vnc/settings.c
index c64c73af..c0d14859 100644
--- a/src/protocols/vnc/settings.c
+++ b/src/protocols/vnc/settings.c
@@ -361,7 +361,8 @@ enum VNC_ARGS_IDX {
     
     /**
      * The number of seconds to wait after sending the magic WoL packet before
-     * attempting to connect to the remote host.
+     * attempting to connect to the remote host.  The default is not to wait
+     * at all (0 seconds).
      */
     IDX_WOL_WAIT_TIME,