diff --git a/src/lib-smtp/smtp-server-command.c b/src/lib-smtp/smtp-server-command.c
index 5659e43373..8e15d77729 100644
--- a/src/lib-smtp/smtp-server-command.c
+++ b/src/lib-smtp/smtp-server-command.c
@@ -130,14 +130,11 @@ void smtp_server_command_debug(struct smtp_server_cmd_ctx *cmd,
 			       const char *format, ...)
 {
 	struct smtp_server_connection *conn = cmd->conn;
-	const struct smtp_server_settings *set = &conn->set;
 	va_list args;
 
-	if (set->debug) {
-		va_start(args, format);
-		e_debug(conn->event, "%s", t_strdup_vprintf(format, args));
-		va_end(args);
-	}
+	va_start(args, format);
+	e_debug(conn->event, "%s", t_strdup_vprintf(format, args));
+	va_end(args);
 }
 
 /*
diff --git a/src/lib-smtp/smtp-server-connection.c b/src/lib-smtp/smtp-server-connection.c
index da858c788f..f5f26f5611 100644
--- a/src/lib-smtp/smtp-server-connection.c
+++ b/src/lib-smtp/smtp-server-connection.c
@@ -40,11 +40,9 @@ void smtp_server_connection_debug(struct smtp_server_connection *conn,
 {
 	va_list args;
 
-	if (conn->set.debug) {
-		va_start(args, format);
-		e_debug(conn->event, "%s", t_strdup_vprintf(format, args));
-		va_end(args);
-	}
+	va_start(args, format);
+	e_debug(conn->event, "%s", t_strdup_vprintf(format, args));
+	va_end(args);
 }
 
 void smtp_server_connection_error(struct smtp_server_connection *conn,
diff --git a/src/lib-smtp/smtp-server-reply.c b/src/lib-smtp/smtp-server-reply.c
index 5515e36619..22a8b1ad58 100644
--- a/src/lib-smtp/smtp-server-reply.c
+++ b/src/lib-smtp/smtp-server-reply.c
@@ -17,16 +17,11 @@ static inline void ATTR_FORMAT(2, 3)
 smtp_server_reply_debug(struct smtp_server_reply *reply,
 			const char *format, ...)
 {
-	struct smtp_server_command *command = reply->command;
-	struct smtp_server_connection *conn = command->context.conn;
-	const struct smtp_server_settings *set = &conn->set;
 	va_list args;
 
-	if (set->debug) {
-		va_start(args, format);
-		e_debug(reply->event, "%s", t_strdup_vprintf(format, args));
-		va_end(args);
-	}
+	va_start(args, format);
+	e_debug(reply->event, "%s", t_strdup_vprintf(format, args));
+	va_end(args);
 }
 
 /*
@@ -443,7 +438,6 @@ static int smtp_server_reply_send_real(struct smtp_server_reply *reply)
 {
 	struct smtp_server_command *cmd = reply->command;
 	struct smtp_server_connection *conn = cmd->context.conn;
-	const struct smtp_server_settings *set = &conn->set;
 	struct ostream *output = conn->conn.output;
 	string_t *textbuf;
 	char *text;
@@ -466,10 +460,8 @@ static int smtp_server_reply_send_real(struct smtp_server_reply *reply)
 		return -1;
 	}
 
-	if (set->debug) {
-		smtp_server_reply_debug(reply, "Sent: %s",
-			smtp_server_reply_get_one_line(reply));
-	}
+	smtp_server_reply_debug(reply, "Sent: %s",
+				smtp_server_reply_get_one_line(reply));
 	return ret;
 }