diff --git a/android/gradle.properties b/android/gradle.properties
index 94a75b2df36aed9e156a335ee171808b57fe6bc6..7e6b4cd36d9877b2acd1b762e65740d34ebaa0ce 100644
--- a/android/gradle.properties
+++ b/android/gradle.properties
@@ -1,5 +1,5 @@
 org.gradle.jvmargs=-Xmx1536M
 android.useAndroidX=true
 android.enableJetifier=true
-app.versionName=0.0.43
-app.versionCode=43
+app.versionName=0.0.44
+app.versionCode=44
diff --git a/fastlane/metadata/android/en-US/changelogs/44.txt b/fastlane/metadata/android/en-US/changelogs/44.txt
new file mode 100644
index 0000000000000000000000000000000000000000..31102995a501e6d7c1e398419eaa49f09e170ec8
--- /dev/null
+++ b/fastlane/metadata/android/en-US/changelogs/44.txt
@@ -0,0 +1 @@
+Fix parse heatmap data.
diff --git a/fastlane/metadata/android/fr-FR/changelogs/44.txt b/fastlane/metadata/android/fr-FR/changelogs/44.txt
new file mode 100644
index 0000000000000000000000000000000000000000..015059604ca91c118448bdc77fdcbd01ece11c35
--- /dev/null
+++ b/fastlane/metadata/android/fr-FR/changelogs/44.txt
@@ -0,0 +1 @@
+Correction sur le traitement des données de la heatmap.
diff --git a/lib/cubit/data_heatmap_cubit.dart b/lib/cubit/data_heatmap_cubit.dart
index 646ba623036421f8a97eccda0c9f642e0bf10d2a..7cd9192e8d0842116c4cde4d124b3d7e87c4318c 100644
--- a/lib/cubit/data_heatmap_cubit.dart
+++ b/lib/cubit/data_heatmap_cubit.dart
@@ -13,10 +13,6 @@ class DataHeatmapCubit extends HydratedCubit<DataHeatmapState> {
     emit(state);
   }
 
-  HeatmapData? getValue() {
-    return state.heatmap;
-  }
-
   void update(HeatmapData? heatmapData) {
     if ((heatmapData != null) && (state.heatmap.toString() != heatmapData.toString())) {
       setValue(heatmapData);
diff --git a/lib/models/heatmap.dart b/lib/models/heatmap.dart
index a29537b8127ed0205e7476dd45b648ac19af599b..81a06ee89314294763ca8f40e721a978723fde06 100644
--- a/lib/models/heatmap.dart
+++ b/lib/models/heatmap.dart
@@ -31,9 +31,8 @@ class HeatmapData {
 
     this.data.keys.forEach((day) {
       Map<String, int> dayMap = {};
-      this.data.keys.forEach((hour) {
-        int? value = this.data[day]?[hour];
-        dayMap[hour.toString()] = value != null ? value.toInt() : 0;
+      this.data[day]?.forEach((hour, count) {
+        dayMap[hour.toString()] = count;
       });
       map[day.toString()] = dayMap;
     });
diff --git a/lib/ui/widgets/cards/heatmap.dart b/lib/ui/widgets/cards/heatmap.dart
index 06b5a0ac9ba6a68a8a65c9bb39ac6ff4f046ac43..bbfdf4f80fdbcb0d47ddd942e2d6b81492289e72 100644
--- a/lib/ui/widgets/cards/heatmap.dart
+++ b/lib/ui/widgets/cards/heatmap.dart
@@ -30,7 +30,7 @@ class CardHeatmap extends StatelessWidget {
               'daysCount': daysCount.toString(),
             },
           ),
-          loader: updateCountsByHour(daysCount),
+          loader: updateHeatmapData(daysCount),
           content: ChartHeatmap(
             chartData: heatmap,
           ),
@@ -39,7 +39,7 @@ class CardHeatmap extends StatelessWidget {
     );
   }
 
-  Widget updateCountsByHour(int daysCount) {
+  Widget updateHeatmapData(int daysCount) {
     final Widget loading = const Text('⏳');
     final Widget done = const Text('');
 
diff --git a/lib/ui/widgets/charts/heatmap.dart b/lib/ui/widgets/charts/heatmap.dart
index 1f4874ee6673fe3110a47c7ab69feb0cc65c5ff8..98483f5db9b246f44c1335a2b4a28a065c559528 100644
--- a/lib/ui/widgets/charts/heatmap.dart
+++ b/lib/ui/widgets/charts/heatmap.dart
@@ -1,5 +1,3 @@
-import 'dart:math';
-
 import 'package:easy_localization/easy_localization.dart';
 import 'package:fl_chart/fl_chart.dart';
 import 'package:flutter/material.dart';
diff --git a/lib/ui/widgets/settings_form.dart b/lib/ui/widgets/settings_form.dart
index d51262db84da3749ba0afb8952329a7861afbd54..1046f865b4a878a013c381f2edf7fb9b0d3be187 100644
--- a/lib/ui/widgets/settings_form.dart
+++ b/lib/ui/widgets/settings_form.dart
@@ -1,7 +1,6 @@
 import 'package:easy_localization/easy_localization.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_bloc/flutter_bloc.dart';
-import 'package:unicons/unicons.dart';
 
 import 'package:scrobbles/config/default_settings.dart';
 import 'package:scrobbles/cubit/settings_cubit.dart';
diff --git a/pubspec.yaml b/pubspec.yaml
index 70ab3de0542c744282a0247188bc30a7a70bb08d..78f61dc0c6fcc289539774124dd75edd5f4b240c 100644
--- a/pubspec.yaml
+++ b/pubspec.yaml
@@ -3,7 +3,7 @@ description: Display scrobbles data and charts
 
 publish_to: 'none'
 
-version: 0.0.43+43
+version: 0.0.44+44
 
 environment:
   sdk: '^3.0.0'