diff --git a/lib/core/services/constants.dart b/lib/core/services/constants.dart
index 726020d..c528ad8 100644
--- a/lib/core/services/constants.dart
+++ b/lib/core/services/constants.dart
@@ -1,3 +1,3 @@
-const String baseUrl = 'https://c519-114-6-25-184.ngrok-free.app/';
+const String baseUrl = 'https://580d-36-85-62-81.ngrok-free.app/';
 
-const String mediaUrl = 'https://c519-114-6-25-184.ngrok-free.app/api/uploads/';
+const String mediaUrl = 'https://580d-36-85-62-81.ngrok-free.app/api/uploads/';
diff --git a/lib/core/services/repositories/history_repository.dart b/lib/core/services/repositories/history_repository.dart
index b83f4b6..2dede40 100644
--- a/lib/core/services/repositories/history_repository.dart
+++ b/lib/core/services/repositories/history_repository.dart
@@ -18,15 +18,25 @@ class HistoryRepository {
         page: 1,
         limit: 10,
       );
-      if (response.statusCode == 200 && response.data != null) {
-        final List<dynamic> historyData = response.data['payload']['history'];
-        if (historyData.isEmpty) {
-          return []; // Mengembalikan list kosong jika tidak ada data
+
+      if (response.statusCode == 200) {
+        final responseData = response.data;
+
+        if (responseData == null ||
+            responseData['payload'] == null ||
+            responseData['payload']['history'] == null) {
+          return [];
         }
+
+        final List<dynamic> historyData = responseData['payload']['history'];
+
+        if (historyData.isEmpty) {
+          return [];
+        }
+
         return historyData.map((json) => HistoryModel.fromJson(json)).toList();
       } else {
-        throw Exception(
-            'Failed to load learning history: ${response.statusMessage}');
+        return [];
       }
     } on DioException catch (e) {
       if (e.response?.statusCode == 404) {