diff --git a/app/Http/Controllers/UsersController.php b/app/Http/Controllers/UsersController.php
index 5403c40..7382137 100644
--- a/app/Http/Controllers/UsersController.php
+++ b/app/Http/Controllers/UsersController.php
@@ -106,14 +106,9 @@ class UsersController extends Controller
      */
     public function death(User $user)
     {
-        $mapZoomLevel = 4;
+        $mapZoomLevel = 18;
         $mapCenterLatitude = $user->getMetadata('cemetery_location_latitude');
         $mapCenterLongitude = $user->getMetadata('cemetery_location_longitude');
-        if ($mapCenterLatitude && $mapCenterLongitude) {
-            $mapZoomLevel = 18;
-        }
-        $mapCenterLatitude = $mapCenterLatitude ?: '-0.87887';
-        $mapCenterLongitude = $mapCenterLongitude ?: '117.4863';
 
         return view('users.death', compact('user', 'mapZoomLevel', 'mapCenterLatitude', 'mapCenterLongitude'));
     }
diff --git a/resources/lang/en/app.php b/resources/lang/en/app.php
index f454dae..fb6ef17 100644
--- a/resources/lang/en/app.php
+++ b/resources/lang/en/app.php
@@ -41,4 +41,5 @@ return [
     'cancel'            => 'Cancel',
 
     'open_in_google_map' => 'Open in Google Map',
+    'data_not_available' => 'Data not available.',
 ];
\ No newline at end of file
diff --git a/resources/lang/id/app.php b/resources/lang/id/app.php
index 1f1d01e..cfbf474 100644
--- a/resources/lang/id/app.php
+++ b/resources/lang/id/app.php
@@ -41,4 +41,5 @@ return [
     'cancel'            => 'Batal',
 
     'open_in_google_map' => 'Buka di Google Map',
+    'data_not_available' => 'Data tidak tersedia.',
 ];
\ No newline at end of file
diff --git a/resources/views/users/death.blade.php b/resources/views/users/death.blade.php
index d05adca..2ceb4f5 100644
--- a/resources/views/users/death.blade.php
+++ b/resources/views/users/death.blade.php
@@ -41,46 +41,51 @@
     <div class="col-md-6">
         <div class="panel panel-default">
             <div class="panel-heading"><h3 class="panel-title">{{ __('user.cemetery_location') }}</h3></div>
-            <div class="panel-body"><div id="mapid"></div></div>
-            <div class="panel-footer">
-                @php
-                    $locationCoordinate = $mapCenterLatitude.','.$mapCenterLongitude.'/@'.$mapCenterLatitude.','.$mapCenterLongitude.','.$mapZoomLevel.'z';
-                @endphp
-                {{ link_to(
-                    'https://www.google.com/maps/place/'.$locationCoordinate,
-                    __('app.open_in_google_map'),
-                    ['class' => 'btn btn-default btn-block', 'target' => '_blank']
-                ) }}
-            </div>
+            @if ($mapCenterLatitude && $mapCenterLongitude)
+                <div class="panel-body"><div id="mapid"></div></div>
+                <div class="panel-footer">
+                    @php
+                        $locationCoordinate = $mapCenterLatitude.','.$mapCenterLongitude.'/@'.$mapCenterLatitude.','.$mapCenterLongitude.','.$mapZoomLevel.'z';
+                    @endphp
+                    {{ link_to(
+                        'https://www.google.com/maps/place/'.$locationCoordinate,
+                        __('app.open_in_google_map'),
+                        ['class' => 'btn btn-default btn-block', 'target' => '_blank']
+                    ) }}
+                </div>
+            @else
+                <div class="panel-body">{{ __('app.data_not_available') }}</div>
+            @endif
         </div>
     </div>
 </div>
 @endsection
 
+@if ($mapCenterLatitude && $mapCenterLongitude)
+    @section('ext_css')
+    <link rel="stylesheet" href="https://unpkg.com/leaflet@1.7.1/dist/leaflet.css"
+      integrity="sha512-xodZBNTC5n17Xt2atTPuE1HxjVMSvLVW9ocqUKLsCC5CXdbqCmblAshOMAS6/keqq/sMZMZ19scR4PsZChSR7A=="
+      crossorigin=""/>
 
-@section('ext_css')
-<link rel="stylesheet" href="https://unpkg.com/leaflet@1.7.1/dist/leaflet.css"
-  integrity="sha512-xodZBNTC5n17Xt2atTPuE1HxjVMSvLVW9ocqUKLsCC5CXdbqCmblAshOMAS6/keqq/sMZMZ19scR4PsZChSR7A=="
-  crossorigin=""/>
-
-<style>
-    #mapid { height: 300px; }
-</style>
-@endsection
+    <style>
+        #mapid { height: 300px; }
+    </style>
+    @endsection
 
-@section('script')
-<script src="https://unpkg.com/leaflet@1.7.1/dist/leaflet.js"
-  integrity="sha512-XQoYMqMTK8LvdxXYG3nZ448hOEQiglfqkJs1NOQV44cWnUrBc8PkAOcXy20w0vlaXaVUearIOBhiXZ5V3ynxwA=="
-  crossorigin=""></script>
+    @section('script')
+    <script src="https://unpkg.com/leaflet@1.7.1/dist/leaflet.js"
+      integrity="sha512-XQoYMqMTK8LvdxXYG3nZ448hOEQiglfqkJs1NOQV44cWnUrBc8PkAOcXy20w0vlaXaVUearIOBhiXZ5V3ynxwA=="
+      crossorigin=""></script>
 
-<script>
-    var mapCenter = [{{ $mapCenterLatitude }}, {{ $mapCenterLongitude }}];
-    var map = L.map('mapid').setView(mapCenter, {{ $mapZoomLevel }});
+    <script>
+        var mapCenter = [{{ $mapCenterLatitude }}, {{ $mapCenterLongitude }}];
+        var map = L.map('mapid').setView(mapCenter, {{ $mapZoomLevel }});
 
-    L.tileLayer('https://{s}.tile.openstreetmap.org/{z}/{x}/{y}.png', {
-        attribution: '&copy; <a href="https://www.openstreetmap.org/copyright">OpenStreetMap</a> contributors'
-    }).addTo(map);
+        L.tileLayer('https://{s}.tile.openstreetmap.org/{z}/{x}/{y}.png', {
+            attribution: '&copy; <a href="https://www.openstreetmap.org/copyright">OpenStreetMap</a> contributors'
+        }).addTo(map);
 
-    var marker = L.marker(mapCenter).addTo(map);
-</script>
-@endsection
+        var marker = L.marker(mapCenter).addTo(map);
+    </script>
+    @endsection
+@endif
\ No newline at end of file