diff --git a/lib/main.dart b/lib/main.dart
index feef64ad..5d4cf3e5 100644
--- a/lib/main.dart
+++ b/lib/main.dart
@@ -19,6 +19,7 @@
 import 'package:flutter/material.dart';
 import 'package:flutter_gen/gen_l10n/app_localizations.dart';
 import 'package:provider/provider.dart';
+import 'package:wger/providers/base_provider.dart';
 import 'package:wger/providers/body_weight.dart';
 import 'package:wger/providers/exercises.dart';
 import 'package:wger/providers/gallery.dart';
@@ -82,12 +83,12 @@ class MyApp extends StatelessWidget {
           update: (context, auth, previous) =>
               previous != null ? previous : NutritionPlansProvider(auth, []),
         ),
-        // ChangeNotifierProxyProvider<AuthProvider, MeasurementProvider>(
-        //   create: (context) =>
-        //       MeasurementProvider(Provider.of<AuthProvider>(context, listen: false)),
-        //   update: (context, auth, previous) =>
-        //       previous != null ? previous : MeasurementProvider(auth),
-        // ),
+        ChangeNotifierProxyProvider<AuthProvider, MeasurementProvider>(
+          create: (context) => MeasurementProvider(
+              WgerBaseProvider(Provider.of<AuthProvider>(context, listen: false))),
+          update: (context, base, previous) =>
+              previous != null ? previous : MeasurementProvider(WgerBaseProvider(base)),
+        ),
         ChangeNotifierProxyProvider<AuthProvider, BodyWeightProvider>(
           create: (context) =>
               BodyWeightProvider(Provider.of<AuthProvider>(context, listen: false), []),
diff --git a/lib/models/measurements/measurement_entry.g.dart b/lib/models/measurements/measurement_entry.g.dart
index f66e7488..9e2fe688 100644
--- a/lib/models/measurements/measurement_entry.g.dart
+++ b/lib/models/measurements/measurement_entry.g.dart
@@ -7,8 +7,7 @@ part of 'measurement_entry.dart';
 // **************************************************************************
 
 MeasurementEntry _$MeasurementEntryFromJson(Map<String, dynamic> json) {
-  $checkKeys(json,
-      requiredKeys: const ['id', 'category', 'date', 'value', 'notes']);
+  $checkKeys(json, requiredKeys: const ['id', 'category', 'date', 'value', 'notes']);
   return MeasurementEntry(
     id: json['id'] as int?,
     category: json['category'] as int,
@@ -18,8 +17,7 @@ MeasurementEntry _$MeasurementEntryFromJson(Map<String, dynamic> json) {
   );
 }
 
-Map<String, dynamic> _$MeasurementEntryToJson(MeasurementEntry instance) =>
-    <String, dynamic>{
+Map<String, dynamic> _$MeasurementEntryToJson(MeasurementEntry instance) => <String, dynamic>{
       'id': instance.id,
       'category': instance.category,
       'date': toDate(instance.date),
diff --git a/lib/screens/dashboard.dart b/lib/screens/dashboard.dart
index 385283dc..309a62c9 100644
--- a/lib/screens/dashboard.dart
+++ b/lib/screens/dashboard.dart
@@ -24,7 +24,7 @@ import 'package:wger/providers/auth.dart';
 import 'package:wger/providers/body_weight.dart';
 import 'package:wger/providers/exercises.dart';
 import 'package:wger/providers/gallery.dart';
-import 'package:wger/providers/measurements.dart';
+import 'package:wger/providers/measurement.dart';
 import 'package:wger/providers/nutrition.dart';
 import 'package:wger/providers/workout_plans.dart';
 import 'package:wger/widgets/core/app_bar.dart';
diff --git a/lib/widgets/measurements/categories.dart b/lib/widgets/measurements/categories.dart
index 8aa05664..15756cca 100644
--- a/lib/widgets/measurements/categories.dart
+++ b/lib/widgets/measurements/categories.dart
@@ -18,7 +18,7 @@
 
 import 'package:flutter/material.dart';
 import 'package:provider/provider.dart';
-import 'package:wger/providers/measurements.dart';
+import 'package:wger/providers/measurement.dart';
 import 'package:wger/screens/measurement_entries_screen.dart';
 
 class CategoriesList extends StatelessWidget {
diff --git a/lib/widgets/measurements/entries.dart b/lib/widgets/measurements/entries.dart
index d66884b5..2fa95a1e 100644
--- a/lib/widgets/measurements/entries.dart
+++ b/lib/widgets/measurements/entries.dart
@@ -20,7 +20,7 @@ import 'package:flutter/material.dart';
 import 'package:intl/intl.dart';
 import 'package:provider/provider.dart';
 import 'package:wger/models/measurements/measurement_category.dart';
-import 'package:wger/providers/measurements.dart';
+import 'package:wger/providers/measurement.dart';
 
 class EntriesList extends StatelessWidget {
   late MeasurementCategory _category;
@@ -28,7 +28,8 @@ class EntriesList extends StatelessWidget {
   Future<void> _loadEntries(BuildContext context) async {
     final provider = Provider.of<MeasurementProvider>(context, listen: false);
     final int categoryId = ModalRoute.of(context)!.settings.arguments as int;
-    _category = await provider.fetchAndSetCategoryEntries(categoryId);
+    await provider.fetchAndSetCategoryEntries(categoryId);
+    _category = provider.findCategoryById(categoryId);
   }
 
   @override