diff --git a/samples/client/petstore/cpprest/ApiClient.cpp b/samples/client/petstore/cpprest/ApiClient.cpp
index dc53f212966..f6e5f11af55 100644
--- a/samples/client/petstore/cpprest/ApiClient.cpp
+++ b/samples/client/petstore/cpprest/ApiClient.cpp
@@ -136,7 +136,10 @@ pplx::task<web::http::http_response> ApiClient::callApi(
                 {
                     body_data[kvp.first] = ModelBase::toJson(kvp.second);
                 }
-                request.set_body(body_data);
+                if (!formParams.empty())
+                {
+                    request.set_body(body_data);
+		}
             }
             else
             {
@@ -145,7 +148,10 @@ pplx::task<web::http::http_response> ApiClient::callApi(
                 {
                     formData.append_query(kvp.first, kvp.second);
                 }
-                request.set_body(formData.query(), U("application/x-www-form-urlencoded"));
+                if (!formParams.empty())
+                {
+                    request.set_body(formData.query(), U("application/x-www-form-urlencoded"));
+                }
             }
         }
     }