diff --git a/src/api/api_utils.rs b/src/api/api_utils.rs
index 2f13d3da8..e993ff425 100644
--- a/src/api/api_utils.rs
+++ b/src/api/api_utils.rs
@@ -1,7 +1,7 @@
 use std::collections::HashMap;
 use std::path::{Path};
 use actix_web::http::header::{CACHE_CONTROL, HeaderValue};
-use actix_web::{HttpRequest, HttpResponse, web};
+use actix_web::{HttpRequest, HttpResponse};
 use log::{debug, error, log_enabled, Level};
 use url::Url;
 use crate::api::api_model::{AppState, UserApiRequest};
@@ -24,7 +24,7 @@ pub async fn serve_file(file_path: &Path, req: &HttpRequest, mime_type: mime::Mi
 }
 
 pub fn get_user_target_by_credentials<'a>(username: &str, password: &str, api_req: &'a UserApiRequest,
-                                                 app_state: &'a web::Data<AppState>) -> Option<(ProxyUserCredentials, &'a ConfigTarget)> {
+                                                 app_state: &'a AppState) -> Option<(ProxyUserCredentials, &'a ConfigTarget)> {
     if !username.is_empty() && !password.is_empty() {
         app_state.config.get_target_for_user(username, password)
     } else {
@@ -37,7 +37,7 @@ pub fn get_user_target_by_credentials<'a>(username: &str, password: &str, api_re
     }
 }
 
-pub fn get_user_target<'a>(api_req: &'a UserApiRequest, app_state: &'a web::Data<AppState>) -> Option<(ProxyUserCredentials, &'a ConfigTarget)> {
+pub fn get_user_target<'a>(api_req: &'a UserApiRequest, app_state: &'a AppState) -> Option<(ProxyUserCredentials, &'a ConfigTarget)> {
     let username = api_req.username.as_str().trim();
     let password = api_req.password.as_str().trim();
     get_user_target_by_credentials(username, password, api_req, app_state)
diff --git a/src/api/m3u_api.rs b/src/api/m3u_api.rs
index f57b86c24..2dde1acf8 100644
--- a/src/api/m3u_api.rs
+++ b/src/api/m3u_api.rs
@@ -11,11 +11,11 @@ use crate::repository::m3u_repository::{m3u_get_file_paths, m3u_get_item_for_str
 use crate::repository::storage::get_target_storage_path;
 use crate::utils::request_utils::mask_sensitive_info;
 
-async fn m3u_api(
-    api_req: UserApiRequest,
-    app_state: web::Data<AppState>,
+fn m3u_api(
+    api_req: &UserApiRequest,
+    app_state: &AppState,
 ) -> HttpResponse {
-    match get_user_target(&api_req, &app_state) {
+    match get_user_target(api_req, app_state) {
         Some((user, target)) => {
             match m3u_load_rewrite_playlist(&app_state.config, target, &user) {
                 Ok(m3u_iter) => {
@@ -38,13 +38,13 @@ async fn m3u_api(
 async fn m3u_api_get(    api_req: web::Query<UserApiRequest>,
                          app_state: web::Data<AppState>,
 ) -> HttpResponse {
-    m3u_api(api_req.into_inner(), app_state).await
+    m3u_api(&api_req.into_inner(), &app_state)
 }
 async fn m3u_api_post(
     api_req: web::Form<UserApiRequest>,
     app_state: web::Data<AppState>,
 ) -> HttpResponse {
-    m3u_api(api_req.into_inner(), app_state).await
+    m3u_api(&api_req.into_inner(), &app_state)
 }
 
 async fn m3u_api_stream(