diff --git a/assets/ffplayout.conf b/assets/ffplayout.conf
index 3cbea865..a9f13a00 100644
--- a/assets/ffplayout.conf
+++ b/assets/ffplayout.conf
@@ -22,7 +22,7 @@ server {
         proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
         proxy_set_header X-Forwarded-Proto $scheme;
         proxy_read_timeout 36000s;
-        proxy_connect_timeout 36000s; 
+        proxy_connect_timeout 36000s;
         proxy_send_timeout 36000s;
         proxy_buffer_size 128k;
         proxy_buffers 4 256k;
@@ -31,6 +31,16 @@ server {
         proxy_pass http://127.0.0.1:8787;
     }
 
+    location /data {
+        proxy_set_header Host $http_host;
+        proxy_set_header X-Real-IP $remote_addr;
+        proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
+        proxy_set_header X-Forwarded-Proto $scheme;
+        proxy_set_header Connection "";
+        proxy_http_version 1.1;
+        proxy_pass http://127.0.0.1:8787/data;
+    }
+
     location /live/ {
         alias /usr/share/ffplayout/public/live/;
     }
diff --git a/ffplayout-frontend b/ffplayout-frontend
index 52411f61..c4aa6f49 160000
--- a/ffplayout-frontend
+++ b/ffplayout-frontend
@@ -1 +1 @@
-Subproject commit 52411f61ef25a1b11129a77d26d987f44c6ea543
+Subproject commit c4aa6f495fd58be368a4266cb426e2c646e1424a