diff --git a/lib/pages/analytics/modules/analytics/views/analytics_page.dart b/lib/pages/analytics/modules/analytics/views/analytics_page.dart
index ca07c389..0a45ba8d 100644
--- a/lib/pages/analytics/modules/analytics/views/analytics_page.dart
+++ b/lib/pages/analytics/modules/analytics/views/analytics_page.dart
@@ -1,4 +1,3 @@
-import 'package:dio/dio.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_bloc/flutter_bloc.dart';
 import 'package:syncrow_web/pages/analytics/modules/air_quality/blocs/device_location/device_location_bloc.dart';
@@ -19,6 +18,7 @@ import 'package:syncrow_web/pages/analytics/services/analytics_devices/analytics
 import 'package:syncrow_web/pages/analytics/services/analytics_devices/remote_energy_management_analytics_devices_service.dart';
 import 'package:syncrow_web/pages/analytics/services/analytics_devices/remote_occupancy_analytics_devices_service.dart';
 import 'package:syncrow_web/pages/analytics/services/device_location/remote_device_location_service.dart';
+import 'package:syncrow_web/pages/analytics/services/device_location/reverse_geocode_device_location_service_decorator.dart';
 import 'package:syncrow_web/pages/analytics/services/energy_consumption_by_phases/remote_energy_consumption_by_phases_service.dart';
 import 'package:syncrow_web/pages/analytics/services/energy_consumption_per_device/remote_energy_consumption_per_device_service.dart';
 import 'package:syncrow_web/pages/analytics/services/occupacy/remote_occupancy_service.dart';
@@ -106,8 +106,8 @@ class _AnalyticsPageState extends State<AnalyticsPage> {
         ),
         BlocProvider(
           create: (context) => DeviceLocationBloc(
-            RemoteDeviceLocationService(
-              Dio(BaseOptions(baseUrl: 'https://api.openweathermap.org/data/2.5')),
+            ReverseGeocodeDeviceLocationServiceDecorator(
+              RemoteDeviceLocationService(_httpService),
             ),
           ),
         ),