diff --git a/android/jni/com/mapswithme/core/jni_helper.cpp b/android/jni/com/mapswithme/core/jni_helper.cpp
index 59e9a48c24..cf12acbd1e 100644
--- a/android/jni/com/mapswithme/core/jni_helper.cpp
+++ b/android/jni/com/mapswithme/core/jni_helper.cpp
@@ -27,6 +27,7 @@ jclass g_ratingClazz;
 jclass g_loggerFactoryClazz;
 jclass g_keyValueClazz;
 jclass g_httpUploaderClazz;
+jclass g_httpUploaderResultClazz;
 
 extern "C"
 {
@@ -51,6 +52,7 @@ JNI_OnLoad(JavaVM * jvm, void *)
   g_loggerFactoryClazz = jni::GetGlobalClassRef(env, "com/mapswithme/util/log/LoggerFactory");
   g_keyValueClazz = jni::GetGlobalClassRef(env, "com/mapswithme/util/KeyValue");
   g_httpUploaderClazz = jni::GetGlobalClassRef(env, "com/mapswithme/util/HttpUploader");
+  g_httpUploaderResultClazz = jni::GetGlobalClassRef(env, "com/mapswithme/util/HttpUploader$Result");
 
   return JNI_VERSION_1_6;
 }
@@ -73,6 +75,7 @@ JNI_OnUnload(JavaVM *, void *)
   env->DeleteGlobalRef(g_loggerFactoryClazz);
   env->DeleteGlobalRef(g_keyValueClazz);
   env->DeleteGlobalRef(g_httpUploaderClazz);
+  env->DeleteGlobalRef(g_httpUploaderResultClazz);
 }
 } // extern "C"
 
diff --git a/android/jni/com/mapswithme/core/jni_helper.hpp b/android/jni/com/mapswithme/core/jni_helper.hpp
index 7ae359b5d8..e575962611 100644
--- a/android/jni/com/mapswithme/core/jni_helper.hpp
+++ b/android/jni/com/mapswithme/core/jni_helper.hpp
@@ -25,6 +25,7 @@ extern jclass g_ratingClazz;
 extern jclass g_loggerFactoryClazz;
 extern jclass g_keyValueClazz;
 extern jclass g_httpUploaderClazz;
+extern jclass g_httpUploaderResultClazz;
 
 namespace jni
 {
diff --git a/android/jni/com/mapswithme/platform/HttpUploader.cpp b/android/jni/com/mapswithme/platform/HttpUploader.cpp
index 6c79ac1ff3..67fdea35ca 100644
--- a/android/jni/com/mapswithme/platform/HttpUploader.cpp
+++ b/android/jni/com/mapswithme/platform/HttpUploader.cpp
@@ -11,11 +11,31 @@
 #include <cstdint>
 #include <functional>
 
+namespace
+{
+platform::HttpUploader::Result ToNativeResult(JNIEnv * env, jobject const src)
+{
+  static jmethodID const getHttpCode =
+    env->GetMethodID(g_httpUploaderResultClazz, "getHttpCode", "()I");
+  static jmethodID const getDescription =
+    env->GetMethodID(g_httpUploaderResultClazz, "getDescription", "()Ljava/lang/String;");
+
+  platform::HttpUploader::Result result;
+
+  result.m_httpCode = static_cast<int32_t>(env->CallIntMethod(src, getHttpCode));
+
+  jni::ScopedLocalRef<jstring> const description(
+    env, static_cast<jstring>(env->CallObjectMethod(src, getDescription)));
+  result.m_description = jni::ToNativeString(env, description.get());
+
+  return result;
+}
+}  // namespace
+
 namespace platform
 {
-void HttpUploader::Upload() const
+HttpUploader::Result HttpUploader::Upload() const
 {
-  CHECK(m_callback, ());
   auto env = jni::GetEnv();
 
   CHECK(env, ());
@@ -37,8 +57,12 @@ void HttpUploader::Upload() const
     env, env->NewObject(g_httpUploaderClazz, httpUploaderConstructor, method.get(), url.get(),
                         params.get(), headers.get(), fileKey.get(), filePath.get()));
 
-  static jmethodID const uploadId = jni::GetMethodID(env, httpUploaderObject, "upload", "()I");
+  static jmethodID const uploadId = jni::GetMethodID(env, httpUploaderObject, "upload",
+                                                     "()Lcom/mapswithme/util/HttpUploader$Result;");
 
-  m_callback(env->CallIntMethod(httpUploaderObject, uploadId), "dummy");
+  jni::ScopedLocalRef<jobject> const result(
+    env, env->CallObjectMethod(httpUploaderObject, uploadId));
+
+  return ToNativeResult(env, result);
 }
 } // namespace platform
diff --git a/android/src/com/mapswithme/util/HttpUploader.java b/android/src/com/mapswithme/util/HttpUploader.java
index fc45b15eab..3150e824d0 100644
--- a/android/src/com/mapswithme/util/HttpUploader.java
+++ b/android/src/com/mapswithme/util/HttpUploader.java
@@ -21,6 +21,30 @@ final class HttpUploader
   @NonNull
   private final String mFilePath;
 
+  private static class Result
+  {
+    private final int mHttpCode;
+    @NonNull
+    private final String mDescription;
+
+    Result(int httpCode, @NonNull String description)
+    {
+      mHttpCode = httpCode;
+      mDescription = description;
+    }
+
+    public int getHttpCode()
+    {
+      return mHttpCode;
+    }
+
+    @NonNull
+    public String getDescription()
+    {
+      return mDescription;
+    }
+  }
+
   @SuppressWarnings("unused")
   private HttpUploader(@NonNull String method, @NonNull String url, @NonNull KeyValue[] params,
                        @NonNull KeyValue[] headers, @NonNull String fileKey, @NonNull String filePath)
@@ -34,9 +58,9 @@ final class HttpUploader
   }
 
   @SuppressWarnings("unused")
-  private int upload()
+  private Result upload()
   {
     // Dummy. Error code 200 - Http OK.
-    return 200;
+    return new Result(200, "");
   }
 }
diff --git a/platform/http_uploader.hpp b/platform/http_uploader.hpp
index 96d74be2e1..be0df7d5ed 100644
--- a/platform/http_uploader.hpp
+++ b/platform/http_uploader.hpp
@@ -10,7 +10,11 @@ namespace platform
 class HttpUploader
 {
 public:
-  using ResultCallback = std::function<void(int32_t httpCode, std::string const & description)>;
+  struct Result
+  {
+    int32_t m_httpCode = 0;
+    std::string m_description;
+  };
 
   void SetMethod(std::string const & method) { m_method = method; }
   void SetUrl(std::string const & url) { m_url = url; }
@@ -18,9 +22,8 @@ public:
   void SetHeaders(std::map<std::string, std::string> const & headers) { m_headers = headers; }
   void SetFileKey(std::string const & fileKey) { m_fileKey = fileKey; }
   void SetFilePath(std::string const & filePath) { m_filePath = filePath; }
-  void SetCallback(ResultCallback const & callback) { m_callback = callback; }
 
-  void Upload() const;
+  Result Upload() const;
 
 private:
   std::string m_method = "POST";
@@ -29,6 +32,5 @@ private:
   std::map<std::string, std::string> m_headers;
   std::string m_fileKey = "file";
   std::string m_filePath;
-  ResultCallback m_callback;
 };
 }  // namespace platform
diff --git a/platform/http_uploader_apple.mm b/platform/http_uploader_apple.mm
index 105a628e08..53801cfdb8 100644
--- a/platform/http_uploader_apple.mm
+++ b/platform/http_uploader_apple.mm
@@ -4,12 +4,21 @@
 #include "platform/http_uploader.hpp"
 
 #include "base/assert.hpp"
+#include "base/waiter.hpp"
+
+#include <memory>
+
+namespace
+{
+  auto const kTimeout = std::chrono::seconds(30);
+}
 
 namespace platform
 {
-void HttpUploader::Upload() const
+HttpUploader::Result HttpUploader::Upload() const
 {
-  CHECK(m_callback, ());
+  std::shared_ptr<Result> resultPtr = std::make_shared<Result>();
+  std::shared_ptr<base::Waiter> waiterPtr = std::make_shared<base::Waiter>();
 
   auto mapTransform =
       ^NSDictionary<NSString *, NSString *> *(std::map<std::string, std::string> keyValues)
@@ -26,9 +35,15 @@ void HttpUploader::Upload() const
                              filePath:@(m_filePath.c_str())
                                params:mapTransform(m_params)
                               headers:mapTransform(m_headers)
-                             callback:^(NSInteger httpCode, NSString * _Nonnull description) {
-                               if (m_callback)
-                                 m_callback(static_cast<int>(httpCode), description.UTF8String);
+                             callback:[resultPtr, waiterPtr](NSInteger httpCode, NSString * _Nonnull description) {
+                               resultPtr->m_httpCode = static_cast<int32_t>(httpCode);
+                               resultPtr->m_description = description.UTF8String;
+                               waiterPtr->Notify();
                              }];
+
+  if (waiterPtr->Wait(kTimeout) == base::Waiter::Result::NoTimeout)
+    return *resultPtr;
+
+  return {};
 }
 } // namespace platform
diff --git a/platform/http_uploader_dummy.cpp b/platform/http_uploader_dummy.cpp
index 12fce40b41..1c31d08a25 100644
--- a/platform/http_uploader_dummy.cpp
+++ b/platform/http_uploader_dummy.cpp
@@ -4,9 +4,9 @@
 
 namespace platform
 {
-void HttpUploader::Upload() const
+HttpUploader::Result HttpUploader::Upload() const
 {
   // Dummy implementation.
-  CHECK(m_callback, ());
+  return {};
 }
 } // namespace platform