diff --git a/src/cwmp.c b/src/cwmp.c
index 8a33335..aa27f11 100644
--- a/src/cwmp.c
+++ b/src/cwmp.c
@@ -228,10 +228,7 @@ int cwmp_schedule_rpc (struct cwmp *cwmp, struct session *session)
 		if (xml_send_message(cwmp, session, NULL))
 			goto retry;
 		if (!session->tree_in)
-		{
-			CWMP_LOG (INFO,"Receive HTTP 204 No Content");
 			goto success;
-		}
 
 		if (xml_handle_message(session))
 			goto retry;
diff --git a/src/http.c b/src/http.c
index 2aca7bf..c7af556 100644
--- a/src/http.c
+++ b/src/http.c
@@ -192,6 +192,11 @@ http_send_message(struct cwmp *cwmp, char *msg_out, char **msg_in)
 
 	curl_easy_getinfo(curl, CURLINFO_RESPONSE_CODE, &http_code);
 
+	if(http_code == 204)
+	{
+		CWMP_LOG (INFO,"Receive HTTP 204 No Content");
+	}
+
 	if (http_code != 200 && http_code != 204)
 		goto error;