diff --git a/repmgr.c b/repmgr.c
index 43b82fea..7e04ae6f 100644
--- a/repmgr.c
+++ b/repmgr.c
@@ -2296,7 +2296,9 @@ do_standby_register(void)
 
 	/* if --wait-sync option set, wait for the records to synchronise */
 
-	if (PQstatus(conn) == CONNECTION_OK && runtime_options.wait_register_sync)
+	if (PQstatus(conn) == CONNECTION_OK &&
+		runtime_options.wait_register_sync == true &&
+		runtime_options.wait_register_sync_seconds > 0)
 	{
 		bool sync_ok = false;
 		int timer = 0;
diff --git a/repmgr.h b/repmgr.h
index 6c29ebd9..dba002e8 100644
--- a/repmgr.h
+++ b/repmgr.h
@@ -113,13 +113,15 @@ typedef struct
 	bool		no_conninfo_password;
 	bool		copy_external_config_files;
 	int			copy_external_config_files_destination;
-	bool		wait_register_sync;
-	int			wait_register_sync_seconds;
 	char		upstream_conninfo[MAXLEN];
 	char		replication_user[MAXLEN];
 
 	char		recovery_min_apply_delay[MAXLEN];
 
+	/* standby register paarameters */
+	bool		wait_register_sync;
+	int			wait_register_sync_seconds;
+
 	/* witness create parameters */
 	bool		witness_pwprompt;
 
@@ -156,7 +158,9 @@ typedef struct
 		false, false, false,		    \
 		/* standby clone parameters */  \
 		false, DEFAULT_WAL_KEEP_SEGMENTS, false, false, false, false, false, false, \
-		false, CONFIG_FILE_SAMEPATH, false, 0, "", "", "", \
+		false, CONFIG_FILE_SAMEPATH, "", "", "", \
+		/* standby register paarameters */ \
+	    false, 0,							 \
 		/* witness create parameters */ \
 		false,                          \
 		/* standby follow parameters */ \