diff --git a/mobile/lib/ui/common/loading_widget.dart b/mobile/lib/ui/common/loading_widget.dart
index ffdc438901..fc10eeb18a 100644
--- a/mobile/lib/ui/common/loading_widget.dart
+++ b/mobile/lib/ui/common/loading_widget.dart
@@ -22,10 +22,12 @@ class EnteLoadingWidget extends StatelessWidget {
         padding: EdgeInsets.all(padding),
         child: SizedBox.fromSize(
           size: Size.square(size),
-          child: CircularProgressIndicator(
-            strokeWidth: 2,
-            color: color ?? getEnteColorScheme(context).strokeBase,
-            strokeCap: StrokeCap.round,
+          child: RepaintBoundary(
+            child: CircularProgressIndicator(
+              strokeWidth: 2,
+              color: color ?? getEnteColorScheme(context).strokeBase,
+              strokeCap: StrokeCap.round,
+            ),
           ),
         ),
       ),
diff --git a/mobile/lib/ui/viewer/location/add_location_sheet.dart b/mobile/lib/ui/viewer/location/add_location_sheet.dart
index 29c79babad..ebcb53872f 100644
--- a/mobile/lib/ui/viewer/location/add_location_sheet.dart
+++ b/mobile/lib/ui/viewer/location/add_location_sheet.dart
@@ -192,13 +192,11 @@ class _AddLocationSheetState extends State<AddLocationSheet> {
                         builder: (context, int? value, _) {
                           Widget widget;
                           if (value == null) {
-                            widget = RepaintBoundary(
-                              child: EnteLoadingWidget(
-                                size: 14,
-                                color: colorScheme.strokeMuted,
-                                alignment: Alignment.centerLeft,
-                                padding: 3,
-                              ),
+                            widget = EnteLoadingWidget(
+                              size: 14,
+                              color: colorScheme.strokeMuted,
+                              alignment: Alignment.centerLeft,
+                              padding: 3,
                             );
                           } else {
                             widget = Column(
diff --git a/mobile/lib/ui/viewer/location/edit_location_sheet.dart b/mobile/lib/ui/viewer/location/edit_location_sheet.dart
index 2aa071fb6d..fa9e06cf3a 100644
--- a/mobile/lib/ui/viewer/location/edit_location_sheet.dart
+++ b/mobile/lib/ui/viewer/location/edit_location_sheet.dart
@@ -184,13 +184,11 @@ class _EditLocationSheetState extends State<EditLocationSheet> {
                         builder: (context, int? value, _) {
                           Widget widget;
                           if (value == null) {
-                            widget = RepaintBoundary(
-                              child: EnteLoadingWidget(
-                                size: 14,
-                                color: colorScheme.strokeMuted,
-                                alignment: Alignment.centerLeft,
-                                padding: 3,
-                              ),
+                            widget = EnteLoadingWidget(
+                              size: 14,
+                              color: colorScheme.strokeMuted,
+                              alignment: Alignment.centerLeft,
+                              padding: 3,
                             );
                           } else {
                             widget = Column(
diff --git a/mobile/lib/ui/viewer/people/save_or_edit_person.dart b/mobile/lib/ui/viewer/people/save_or_edit_person.dart
index 2d4ddd10cd..5c91ad9d68 100644
--- a/mobile/lib/ui/viewer/people/save_or_edit_person.dart
+++ b/mobile/lib/ui/viewer/people/save_or_edit_person.dart
@@ -911,13 +911,9 @@ class _EmailSectionState extends State<_EmailSection> {
                           "Error getting isMeAssigned",
                           snapshot.error,
                         );
-                        return const RepaintBoundary(
-                          child: EnteLoadingWidget(),
-                        );
+                        return const EnteLoadingWidget();
                       } else {
-                        return const RepaintBoundary(
-                          child: EnteLoadingWidget(),
-                        );
+                        return const EnteLoadingWidget();
                       }
                     },
                   ),