diff --git a/server/src/server/services/tables_data_service.rs b/server/src/server/services/tables_data_service.rs
index 043734a..c0ec0ac 100644
--- a/server/src/server/services/tables_data_service.rs
+++ b/server/src/server/services/tables_data_service.rs
@@ -17,7 +17,7 @@ impl TablesData for TablesDataService {
         request: Request<PostTableDataRequest>,
     ) -> Result<Response<PostTableDataResponse>, Status> {
         let request = request.into_inner();
-        // Just pass through the response instead of creating a new one
-        post_table_data(&self.db_pool, request).await
+        let response = post_table_data(&self.db_pool, request).await?;
+        Ok(Response::new(response)) // Wrap the response in a Response
     }
 }
diff --git a/server/src/tables_data/handlers/post_table_data.rs b/server/src/tables_data/handlers/post_table_data.rs
index a0ead03..2011e21 100644
--- a/server/src/tables_data/handlers/post_table_data.rs
+++ b/server/src/tables_data/handlers/post_table_data.rs
@@ -9,7 +9,7 @@ use common::proto::multieko2::tables_data::{PostTableDataRequest, PostTableDataR
 pub async fn post_table_data(
     db_pool: &PgPool,
     request: PostTableDataRequest,
-) -> Result<Response<PostTableDataResponse>, Status> {
+) -> Result<PostTableDataResponse, Status> { // Return PostTableDataResponse directly
     let profile_name = request.profile_name;
     let table_name = request.table_name;
     let data = request.data;
@@ -143,9 +143,9 @@ pub async fn post_table_data(
         .await
         .map_err(|e| Status::internal(format!("Insert failed: {}", e)))?;
 
-    Ok(Response::new(PostTableDataResponse {
+    Ok(PostTableDataResponse { // Return PostTableDataResponse directly
         success: true,
         message: "Data inserted successfully".into(),
         inserted_id,
-    }))
+    })
 }