diff --git a/scripts/base/protocols/ftp/main.zeek b/scripts/base/protocols/ftp/main.zeek
index 804f3eb11b..89c06765c8 100644
--- a/scripts/base/protocols/ftp/main.zeek
+++ b/scripts/base/protocols/ftp/main.zeek
@@ -261,8 +261,8 @@ event ftp_request(c: connection, command: string, arg: string) &priority=5
 	# attackers.
 	if ( c?$ftp && c$ftp?$cmdarg && c$ftp?$reply_code )
 		{
-		remove_pending_cmd(c$ftp$pending_commands, c$ftp$cmdarg);
-		ftp_message(c);
+		if ( remove_pending_cmd(c$ftp$pending_commands, c$ftp$cmdarg) )
+			ftp_message(c);
 		}
 
 	local id = c$id;
diff --git a/testing/btest/Baseline/scripts.base.protocols.ftp.ftp-get-file-size/ftp.log b/testing/btest/Baseline/scripts.base.protocols.ftp.ftp-get-file-size/ftp.log
index 2ab0dd8064..e3ae3bb833 100644
--- a/testing/btest/Baseline/scripts.base.protocols.ftp.ftp-get-file-size/ftp.log
+++ b/testing/btest/Baseline/scripts.base.protocols.ftp.ftp-get-file-size/ftp.log
@@ -8,7 +8,6 @@
 #fields	ts	uid	id.orig_h	id.orig_p	id.resp_h	id.resp_p	user	password	command	arg	mime_type	file_size	reply_code	reply_msg	data_channel.passive	data_channel.orig_h	data_channel.resp_h	data_channel.resp_p	fuid
 #types	time	string	addr	port	addr	port	string	string	string	string	string	count	count	string	bool	addr	addr	port	string
 XXXXXXXXXX.XXXXXX	CHhAvVGS1DHFjwGM9	192.168.21.95	54089	164.107.123.6	21	<unknown>	-	PASV	-	-	-	227	Entering Passive Mode (164,107,123,6,183,187)	T	192.168.21.95	164.107.123.6	47035	-
-XXXXXXXXXX.XXXXXX	CHhAvVGS1DHFjwGM9	192.168.21.95	54089	164.107.123.6	21	<unknown>	-	PASV	-	-	-	227	Entering Passive Mode (164,107,123,6,183,187)	-	-	-	-	-
 XXXXXXXXXX.XXXXXX	CHhAvVGS1DHFjwGM9	192.168.21.95	54089	164.107.123.6	21	<unknown>	-	PASV	-	-	-	227	Entering Passive Mode (164,107,123,6,183,231)	T	192.168.21.95	164.107.123.6	47079	FzwelK1cvu4OroNgn2
 XXXXXXXXXX.XXXXXX	CHhAvVGS1DHFjwGM9	192.168.21.95	54089	164.107.123.6	21	<unknown>	-	PASV	-	-	-	227	Entering Passive Mode (164,107,123,6,183,211)	T	192.168.21.95	164.107.123.6	47059	F9FJGR2omqil0TrC4l
 XXXXXXXXXX.XXXXXX	CHhAvVGS1DHFjwGM9	192.168.21.95	54089	164.107.123.6	21	<unknown>	-	PASV	-	-	-	227	Entering Passive Mode (164,107,123,6,183,197)	T	192.168.21.95	164.107.123.6	47045	FbSjjXYPAIpF2a1F8