diff --git a/shadow-cljs.edn b/shadow-cljs.edn
index 584d9b3061..0283dab696 100644
--- a/shadow-cljs.edn
+++ b/shadow-cljs.edn
@@ -71,6 +71,8 @@
      status-im.config/STATUS_BUILD_PROXY_PASSWORD #shadow/env "STATUS_BUILD_PROXY_PASSWORD"
      status-im.config/STATUS_BACKEND_SERVER_ENABLED #shadow/env "STATUS_BACKEND_SERVER_ENABLED"
      status-im.config/STATUS_BACKEND_SERVER_HOST #shadow/env "STATUS_BACKEND_SERVER_HOST"
+     status-im.config/STATUS_BACKEND_SERVER_MEDIA_SERVER_ENABLE_TLS
+     #shadow/env "STATUS_BACKEND_SERVER_MEDIA_SERVER_ENABLE_TLS"
      status-im.config/STATUS_BACKEND_SERVER_IMAGE_SERVER_URI_PREFIX
      #shadow/env "STATUS_BACKEND_SERVER_IMAGE_SERVER_URI_PREFIX"
      status-im.config/STATUS_BACKEND_SERVER_ROOT_DATA_DIR #shadow/env
diff --git a/src/status_im/config.cljs b/src/status_im/config.cljs
index d5a6db73c3..3ccdf9480e 100644
--- a/src/status_im/config.cljs
+++ b/src/status_im/config.cljs
@@ -136,6 +136,9 @@
 ;; The port comes from your running status backend server.
 ;; If you run it by PORT=60000 make run-status-backend , then host will likely be 127.0.0.1:60000
 (goog-define STATUS_BACKEND_SERVER_HOST "")
+;; enable media server over https or http
+;; if you're using android simulator, set it to "0"
+(goog-define STATUS_BACKEND_SERVER_MEDIA_SERVER_ENABLE_TLS "1")
 ;; /path/to/root/data/dir
 ;; make sure it exists, it should be in absolute path
 (goog-define STATUS_BACKEND_SERVER_ROOT_DATA_DIR "")
diff --git a/src/status_im/contexts/profile/events.cljs b/src/status_im/contexts/profile/events.cljs
index b35e224f28..852d03a027 100644
--- a/src/status_im/contexts/profile/events.cljs
+++ b/src/status_im/contexts/profile/events.cljs
@@ -31,10 +31,12 @@
 (rf/reg-fx
  :profile/get-profiles-overview
  (fn [callback]
-   (native-module/initialize-application {:dataDir       (native-module/backup-disabled-data-dir)
-                                          :mixpanelAppId config/mixpanel-app-id
-                                          :mixpanelToken config/mixpanel-token}
-                                         callback)))
+   (native-module/initialize-application
+    {:dataDir              (native-module/backup-disabled-data-dir)
+     :mixpanelAppId        config/mixpanel-app-id
+     :mixpanelToken        config/mixpanel-token
+     :mediaServerEnableTLS (config/enabled? config/STATUS_BACKEND_SERVER_MEDIA_SERVER_ENABLE_TLS)}
+    callback)))
 
 (rf/reg-event-fx
  :profile/profile-selected
diff --git a/status-go-version.json b/status-go-version.json
index 0ca1ab73a7..98e838c4c9 100644
--- a/status-go-version.json
+++ b/status-go-version.json
@@ -3,7 +3,7 @@
     "_comment": "Instead use: scripts/update-status-go.sh <rev>",
     "owner": "status-im",
     "repo": "status-go",
-    "version": "v3.8.0",
-    "commit-sha1": "b3dbe91b5fab4fdab475ee94549629a6d2988ccc",
-    "src-sha256": "0p104qd799rwhiqxfdkd6gh4phsby6zyay98mv0sapjxim3nz4xi"
+    "version": "chore/http_media_server",
+    "commit-sha1": "cae9d35daba66dee5b20a95cc244872d48934814",
+    "src-sha256": "0vilpalx0ackrg2pdx57br6rsq52508520kkdklkfjijlfasawdh"
 }