diff --git a/Src/Utilities/mfp.py b/Src/Utilities/mfp.py
index a6fc78e..8e4bdcf 100644
--- a/Src/Utilities/mfp.py
+++ b/Src/Utilities/mfp.py
@@ -10,11 +10,14 @@ async def transform_mfp(mfp_stream_url,MFP_url,MFP_password,client):
     try:
         response = await client.get(mfp_stream_url)
         data = response.json()
-        if data['mediaflow_endpoint'] == 'hls_manifest_proxy':
-            MFP_url += '/proxy/hls/manifest.m3u8'
+        if data['mediaflow_endpoint']:
+            if data['mediaflow_endpoint'] == 'hls_manifest_proxy':
+                MFP_url += '/proxy/hls/manifest.m3u8'
+            else:
+                MFP_url += '/proxy/stream'
+            url = MFP_url + "?api_password=" + MFP_password + "&d=" + urllib.parse.quote(data['destination_url'])
         else:
-            MFP_url += '/proxy/stream'
-        url = MFP_url + "?api_password=" + MFP_password + "&d=" + urllib.parse.quote(data['destination_url'])
+            url = data['mediaflow_proxy_url'] + "?api_password=" + data['query_params']['api_password'] + "&d=" + urllib.parse.quote(data['destination_url'])
         for i in data['request_headers']:
             url += f"&h_{i}={urllib.parse.quote(data['request_headers'][i])}"
         return url