diff --git a/src/callers/coverart.rs b/src/callers/coverart.rs
index b9333fa..fe62409 100644
--- a/src/callers/coverart.rs
+++ b/src/callers/coverart.rs
@@ -106,7 +106,7 @@ pub mod db {
     pub async fn get_coverart_queue_with_id(pool: &sqlx::PgPool, id: &uuid::Uuid) -> Result<super::CoverArtQueue, sqlx::Error> {
         let result = sqlx::query(
             r#"
-            SELECT id, song_queue_id FROM "coverartQueue" WHERE id = $1 RETURNING id, song_queue_id;
+            SELECT id, song_queue_id FROM "coverartQueue" WHERE id = $1 RETURNING id;
             "#
             )
             .bind(id)
@@ -120,7 +120,8 @@ pub mod db {
             Ok(row) => {
                 Ok(super::CoverArtQueue {
                     id: row.try_get("id").map_err(|_e| sqlx::Error::RowNotFound).unwrap(),
-                    song_queue_id: row.try_get("song_queue_id").map_err(|_e| sqlx::Error::RowNotFound).unwrap(),
+                    // song_queue_id: row.try_get("song_queue_id").map_err(|_e| sqlx::Error::RowNotFound).unwrap(),
+                    song_queue_id: uuid::Uuid::nil(),
                 })
             }
             Err(_) => Err(sqlx::Error::RowNotFound)
diff --git a/src/main.rs b/src/main.rs
index 993b5b5..a510eb9 100644
--- a/src/main.rs
+++ b/src/main.rs
@@ -842,4 +842,99 @@ mod tests {
 
         let _ = db_mgr::drop_database(&tm_pool, &db_name).await;
     }
+
+    #[tokio::test]
+    async fn test_fetch_coverart_queue_without_data() {
+        let tm_pool = db_mgr::get_pool().await.unwrap();
+        let db_name = db_mgr::generate_db_name().await;
+
+        match db_mgr::create_database(&tm_pool, &db_name).await {
+            Ok(_) => {
+                println!("Success");
+            }
+            Err(err) => {
+                assert!(false, "Error: {:?}", err);
+            }
+        }
+
+        let pool = db_mgr::connect_to_db(&db_name).await.unwrap();
+        db::migrations(&pool).await;
+
+        let app = init::app(pool).await;
+
+        match song_queue_req(&app).await {
+            Ok(response) => {
+                let resp =
+                    get_resp_data::<crate::callers::coverart::response::Response>(response).await;
+                assert_eq!(false, resp.data.is_empty(), "Should not be empty");
+                let song_queue_id = resp.data[0];
+                assert_eq!(false, song_queue_id.is_nil(), "Should not be empty");
+
+                // Send request
+                match upload_coverart_queue_req(&app).await {
+                    Ok(response) => {
+                        let resp =
+                            get_resp_data::<crate::callers::coverart::response::Response>(response)
+                                .await;
+                        assert_eq!(false, resp.data.is_empty(), "Should not be empty");
+                        let coverart_id = resp.data[0];
+                        assert_eq!(false, coverart_id.is_nil(), "Should not be empty");
+
+                        match coverart_queue_song_queue_link_req(&app, &coverart_id, &song_queue_id).await
+                        {
+                            Ok(response) => {
+                                let resp = get_resp_data::<
+                                    crate::callers::coverart::response::link::Response,
+                                >(response)
+                                .await;
+                                assert_eq!(false, resp.data.is_empty(), "Should not be empty");
+                                let resp_coverart_id = resp.data[0].coverart_id;
+                                let resp_song_queue_id = resp.data[0].song_queue_id;
+
+                                assert_eq!(false, resp_coverart_id.is_nil(), "Should not be empty");
+                                assert_eq!(
+                                    false,
+                                    resp_song_queue_id.is_nil(),
+                                    "Should not be empty"
+                                );
+
+                                let uri = format!("{}?id={}", crate::callers::endpoints::QUEUECOVERART, resp_coverart_id);
+
+                                match app.clone().oneshot(
+                                    axum::http::Request::builder()
+                                    .method(axum::http::Method::GET)
+                                    .uri(uri)
+                                    .header(axum::http::header::CONTENT_TYPE, "application/json")
+                                    .body(axum::body::Body::empty())
+                                    .unwrap()
+                                    ).await {
+                                    Ok(response) => {
+                                        let resp = get_resp_data::<
+                                            crate::callers::coverart::response::fetch_coverart_no_data::Response,
+                                        >(response)
+                                        .await;
+                                        assert_eq!(false, resp.data.is_empty(), "Should not be empty");
+                                    }
+                                    Err(err) => {
+                                        assert!(false, "Error: {:?}", err);
+                                    }
+                                }
+                            }
+                            Err(err) => {
+                                assert!(false, "Error: {:?}", err);
+                            }
+                        }
+                    }
+                    Err(err) => {
+                        assert!(false, "Error: {:?}", err);
+                    }
+                }
+            }
+            Err(err) => {
+                assert!(false, "Error: {:?}", err);
+            }
+        }
+
+        let _ = db_mgr::drop_database(&tm_pool, &db_name).await;
+    }
 }