diff --git a/server/src/services/map.service.spec.ts b/server/src/services/map.service.spec.ts
index 3936e3ee0c..2792e129da 100644
--- a/server/src/services/map.service.spec.ts
+++ b/server/src/services/map.service.spec.ts
@@ -103,6 +103,8 @@ describe(MapService.name, () => {
         name: 'Home',
         latitude: 12.34,
         longitude: 56.78,
+        createdAt: new Date(),
+        updatedAt: new Date(),
       };
 
       mocks.map.getFavoriteLocations.mockResolvedValue([favoriteLocation]);
@@ -118,7 +120,16 @@ describe(MapService.name, () => {
   describe('createFavoriteLocation', () => {
     it('should create a new favorite location', async () => {
       const dto: CreateFavoriteLocationDto = { name: 'Work', latitude: 1, longitude: 2 };
-      const created = { id: 'loc2', userId: authStub.user1.user.id, ...dto };
+
+      const created = {
+        id: 'loc2',
+        userId: authStub.user1.user.id,
+        name: 'Work',
+        latitude: 1,
+        longitude: 2,
+        createdAt: new Date(),
+        updatedAt: new Date(),
+      };
 
       mocks.map.createFavoriteLocation.mockResolvedValue(created);
 
@@ -137,7 +148,16 @@ describe(MapService.name, () => {
   describe('updateFavoriteLocation', () => {
     it('should update an existing favorite location', async () => {
       const dto: UpdateFavoriteLocationDto = { name: 'Gym' };
-      const updated = { id: 'loc3', userId: authStub.user1.user.id, name: 'Gym', latitude: null, longitude: null };
+
+      const updated = {
+        id: 'loc3',
+        userId: authStub.user1.user.id,
+        name: 'Gym',
+        latitude: null,
+        longitude: null,
+        createdAt: new Date(),
+        updatedAt: new Date(),
+      };
 
       mocks.map.updateFavoriteLocation.mockResolvedValue(updated);
 
@@ -154,7 +174,7 @@ describe(MapService.name, () => {
 
   describe('deleteFavoriteLocation', () => {
     it('should call repository to delete a location by id', async () => {
-      mocks.map.deleteFavoriteLocation.mockResolvedValue(undefined);
+      mocks.map.deleteFavoriteLocation.mockResolvedValue();
 
       await sut.deleteFavoriteLocation('loc4');
 
diff --git a/web/src/lib/components/shared-components/change-location.svelte b/web/src/lib/components/shared-components/change-location.svelte
index 0d84b2dd08..8d90efb42f 100644
--- a/web/src/lib/components/shared-components/change-location.svelte
+++ b/web/src/lib/components/shared-components/change-location.svelte
@@ -61,13 +61,13 @@
   const loadFavoriteLocations = async () => {
     try {
       favoriteLocations = await getFavoriteLocations();
-    } catch (err) {
-      handleError(err, 'Failed to load favorite locations');
+    } catch (error) {
+      handleError(error, 'Failed to load favorite locations');
     }
   };
 
-  onMount(() => {
-    loadFavoriteLocations();
+  onMount(async () => {
+    await loadFavoriteLocations();
   });
 
   $effect(() => {
@@ -110,8 +110,8 @@
       favoriteLocations = [...favoriteLocations, newLocation];
       favoriteLocations = favoriteLocations.sort((a, b) => a.name.localeCompare(b.name));
       newFavoriteName = '';
-    } catch (err) {
-      handleError(err, 'Failed to save favorite location');
+    } catch (error) {
+      handleError(error, 'Failed to save favorite location');
     } finally {
       savingFavorite = false;
     }
@@ -121,8 +121,8 @@
     try {
       await deleteFavoriteLocation({ id: locationId });
       favoriteLocations = favoriteLocations.filter((loc) => loc.id !== locationId);
-    } catch (err) {
-      handleError(err, 'Failed to delete favorite location');
+    } catch (error) {
+      handleError(error, 'Failed to delete favorite location');
     }
   };
 
@@ -291,6 +291,7 @@
               {#each favoriteLocations as location (location.id)}
                 <li>
                   <button
+                    type="button"
                     class="w-full"
                     onclick={() => handleUseSuggested(location.latitude!, location.longitude!, 14)}
                   >
@@ -305,9 +306,9 @@
                         size="medium"
                         color="danger"
                         aria-label={$t('delete')}
-                        onclick={(e: Event) => {
+                        onclick={async (e: Event) => {
                           e.stopPropagation();
-                          handleDeleteFavorite(location.id);
+                          await handleDeleteFavorite(location.id);
                         }}
                       />
                     </div>