diff --git a/http-handler/Client/Client.php b/http-handler/Client/Client.php
index 83e1fbaa..cd0f2f01 100644
--- a/http-handler/Client/Client.php
+++ b/http-handler/Client/Client.php
@@ -98,16 +98,16 @@ class Client extends ClientAbstracts
 	 */
 	private function setParams(SwowClient $client, $path, $data): string
 	{
+		$content = $this->getData()->getContents();
+		if (!empty($content)) {
+			$client->setData($content);
+		}
 		if ($this->isGet()) {
 			if (!empty($data)) $path .= '?' . $data;
-			if (!empty($this->getData())) {
-				$client->setData($this->getData());
-			}
 		} else {
-			if (!empty($this->getData())) {
-				$client->setData($this->getData());
-			} else {
-				$client->setData($this->mergeParams($data));
+			$data = $this->mergeParams($data);
+			if (!empty($data)) {
+				$client->setData($data);
 			}
 		}
 		return $path;
diff --git a/http-handler/Client/Curl.php b/http-handler/Client/Curl.php
index 9c1a0d4b..854fc227 100644
--- a/http-handler/Client/Curl.php
+++ b/http-handler/Client/Curl.php
@@ -55,12 +55,14 @@ class Curl extends ClientAbstracts
 		if ($isHttps !== false) {
 			$this->curlHandlerSslSet($resource);
 		}
-		if (empty($params) && empty($this->getData())) {
+
+		$contents = $this->getData()->getContents();
+		if (empty($params) && empty($contents)) {
 			return $resource;
 		}
 
-		if (!empty($this->getData())) {
-			curl_setopt($resource, CURLOPT_POSTFIELDS, $this->getData());
+		if (!empty($contents)) {
+			curl_setopt($resource, CURLOPT_POSTFIELDS, $contents);
 		} else if ($method === self::POST) {
 			curl_setopt($resource, CURLOPT_POSTFIELDS, $this->mergeParams($params));
 		} else if ($method === self::UPLOAD) {