diff --git a/lib/pages/analytics/modules/analytics/strategies/air_quality_data_loading_strategy.dart b/lib/pages/analytics/modules/analytics/strategies/air_quality_data_loading_strategy.dart
index 19f9775d..dc3b1c5e 100644
--- a/lib/pages/analytics/modules/analytics/strategies/air_quality_data_loading_strategy.dart
+++ b/lib/pages/analytics/modules/analytics/strategies/air_quality_data_loading_strategy.dart
@@ -48,7 +48,7 @@ final class AirQualityDataLoadingStrategy implements AnalyticsDataLoadingStrateg
     CommunityModel community,
     SpaceModel child,
   ) {
-    if (child.children.isNotEmpty) return onSpaceSelected(context, community, child);
+    return onSpaceSelected(context, community, child);
   }
 
   @override
diff --git a/lib/pages/analytics/modules/analytics/strategies/energy_management_data_loading_strategy.dart b/lib/pages/analytics/modules/analytics/strategies/energy_management_data_loading_strategy.dart
index c0d03879..e73b5179 100644
--- a/lib/pages/analytics/modules/analytics/strategies/energy_management_data_loading_strategy.dart
+++ b/lib/pages/analytics/modules/analytics/strategies/energy_management_data_loading_strategy.dart
@@ -68,9 +68,7 @@ class EnergyManagementDataLoadingStrategy implements AnalyticsDataLoadingStrateg
     CommunityModel community,
     SpaceModel child,
   ) {
-    if (child.children.isNotEmpty) {
-      return onSpaceSelected(context, community, child);
-    }
+    return onSpaceSelected(context, community, child);
   }
 
   @override
diff --git a/lib/pages/analytics/modules/analytics/strategies/occupancy_data_loading_strategy.dart b/lib/pages/analytics/modules/analytics/strategies/occupancy_data_loading_strategy.dart
index 158f5128..5241564c 100644
--- a/lib/pages/analytics/modules/analytics/strategies/occupancy_data_loading_strategy.dart
+++ b/lib/pages/analytics/modules/analytics/strategies/occupancy_data_loading_strategy.dart
@@ -48,7 +48,7 @@ class OccupancyDataLoadingStrategy implements AnalyticsDataLoadingStrategy {
     CommunityModel community,
     SpaceModel child,
   ) {
-    if (child.children.isNotEmpty) return onSpaceSelected(context, community, child);
+    return onSpaceSelected(context, community, child);
   }
 
   @override
diff --git a/lib/pages/analytics/modules/energy_management/helpers/energy_management_charts_helper.dart b/lib/pages/analytics/modules/energy_management/helpers/energy_management_charts_helper.dart
index 567e03ed..11c088e8 100644
--- a/lib/pages/analytics/modules/energy_management/helpers/energy_management_charts_helper.dart
+++ b/lib/pages/analytics/modules/energy_management/helpers/energy_management_charts_helper.dart
@@ -38,7 +38,7 @@ abstract final class EnergyManagementChartsHelper {
         sideTitles: SideTitles(
           showTitles: true,
           maxIncluded: false,
-          minIncluded: true,
+          minIncluded: false,
           interval: leftTitlesInterval,
           reservedSize: 110,
           getTitlesWidget: (value, meta) => Padding(
@@ -50,7 +50,7 @@ abstract final class EnergyManagementChartsHelper {
                 value.formatNumberToKwh,
                 style: context.textTheme.bodySmall?.copyWith(
                   fontSize: 12,
-                  color: ColorsManager.greyColor,
+                  color: ColorsManager.lightGreyColor,
                 ),
               ),
             ),
diff --git a/lib/pages/analytics/modules/energy_management/widgets/energy_consumption_by_phases_chart.dart b/lib/pages/analytics/modules/energy_management/widgets/energy_consumption_by_phases_chart.dart
index 1497d0fd..001f4d2c 100644
--- a/lib/pages/analytics/modules/energy_management/widgets/energy_consumption_by_phases_chart.dart
+++ b/lib/pages/analytics/modules/energy_management/widgets/energy_consumption_by_phases_chart.dart
@@ -170,7 +170,7 @@ class EnergyConsumptionByPhasesChart extends StatelessWidget {
               child: Text(
                 month,
                 style: context.textTheme.bodySmall?.copyWith(
-                  color: ColorsManager.greyColor,
+                  color: ColorsManager.lightGreyColor,
                   fontSize: 11,
                 ),
               ),
diff --git a/lib/pages/analytics/modules/energy_management/widgets/energy_consumption_by_phases_chart_box.dart b/lib/pages/analytics/modules/energy_management/widgets/energy_consumption_by_phases_chart_box.dart
index 1766266c..1bd1ed9e 100644
--- a/lib/pages/analytics/modules/energy_management/widgets/energy_consumption_by_phases_chart_box.dart
+++ b/lib/pages/analytics/modules/energy_management/widgets/energy_consumption_by_phases_chart_box.dart
@@ -19,10 +19,12 @@ class EnergyConsumptionByPhasesChartBox extends StatelessWidget {
           decoration: secondarySection,
           child: Column(
             mainAxisSize: MainAxisSize.min,
-            spacing: 20,
             children: [
               AnalyticsErrorWidget(state.errorMessage),
-              EnergyConsumptionByPhasesTitle(isLoading: state.status == EnergyConsumptionByPhasesStatus.loading,),
+              EnergyConsumptionByPhasesTitle(
+                isLoading: state.status == EnergyConsumptionByPhasesStatus.loading,
+              ),
+              const SizedBox(height: 20),
               Expanded(
                 child: EnergyConsumptionByPhasesChart(
                   energyData: state.chartData,