diff --git a/api-customer/src/controllers/telemetryController.py b/api-customer/src/controllers/telemetryController.py
index 3566992d..aceca7b5 100644
--- a/api-customer/src/controllers/telemetryController.py
+++ b/api-customer/src/controllers/telemetryController.py
@@ -23,25 +23,33 @@ class TelemetryController:
         try:
             odata_filter = request.args.get("$filter")
             start_timestamp, end_timestamp = self._extract_dates_from_odata(odata_filter)
-            return self._database_service.find_by_date("telemetry", start_timestamp, end_timestamp)
+            result = self._database_service.find_by_date("telemetry", start_timestamp, end_timestamp)
+            return jsonify({"success" : True, "data" : result}), 200
         except Exception as e:
             logger.log_info(e)
+            return jsonify({"success": False, "data": None}), 500
 
     def light(self):
         try:
             odata_filter = request.args.get("$filter")
-            start_date, end_date = self._extract_dates_from_odata(odata_filter)
-            return self._database_service.find_by_date("telemetry", start_date, end_date)
+            start_timestamp, end_timestamp = self._extract_dates_from_odata(odata_filter)
+            result = self._database_service.find_by_date("telemetry", start_timestamp, end_timestamp)
+            return jsonify({"success" : True, "data" : result}), 200
         except Exception as e:
             logger.log_info(e)
+            return jsonify({"success": False, "data": None}), 500
+
 
     def gps(self):
         try:
             odata_filter = request.args.get("$filter")
-            start_date, end_date = self._extract_dates_from_odata(odata_filter)
-            return self._database_service.find_by_date("telemetry", start_date, end_date)
+            start_timestamp, end_timestamp = self._extract_dates_from_odata(odata_filter)
+            result = self._database_service.find_by_date("telemetry", start_timestamp, end_timestamp)
+            return jsonify({"success" : True, "data" : result}), 200
         except Exception as e:
             logger.log_info(e)
+            return jsonify({"success": False, "data": None}), 500
+
 
     def _extract_dates_from_odata(self, filter_str):