diff --git a/app/Models/User.php b/app/Models/User.php
index a0f87c8c..b68afbfe 100644
--- a/app/Models/User.php
+++ b/app/Models/User.php
@@ -28,7 +28,7 @@ class User extends Authenticatable
     ];
 
     // Accessors
-    public function getAvatarAttribute($avatar)
+    public function getAvatarPathAttribute($avatar)
     {
         return $avatar ? '/storage/avatars/' . $avatar : 'https://via.placeholder.com/250';
     }
diff --git a/resources/views/activities/index.blade.php b/resources/views/activities/index.blade.php
index 0b5b13b1..9ab1bd98 100644
--- a/resources/views/activities/index.blade.php
+++ b/resources/views/activities/index.blade.php
@@ -10,7 +10,7 @@
                 <div class="box__section row">
                     <div class="row__column row__column--compact mr-2" style="width: 25px;">
                         @if ($activity->user)
-                            <img class="avatar" src="{{ $activity->user->avatar }}" />
+                            <img class="avatar" src="{{ $activity->user->avatar_path }}" />
                         @endif
                     </div>
                     <div class="row__column row__column--middle">{{ __('activities.' . $activity->action) }} <a href="/{{ $activity->entity_type }}s/{{ $activity->entity_id }}">#{{ $activity->entity_id }}</a></div>
diff --git a/resources/views/layout.blade.php b/resources/views/layout.blade.php
index e75fa64c..8073de4c 100644
--- a/resources/views/layout.blade.php
+++ b/resources/views/layout.blade.php
@@ -100,7 +100,7 @@
                             <li>
                                 <dropdown>
                                     <span slot="button">
-                                        <img src="{{ Auth::user()->avatar }}" class="avatar mr-05" /> <i class="fas fa-caret-down fa-sm"></i>
+                                        <img src="{{ Auth::user()->avatar_path }}" class="avatar mr-05" /> <i class="fas fa-caret-down fa-sm"></i>
                                     </span>
                                     <ul slot="menu" v-cloak>
                                         <li>
diff --git a/resources/views/settings/profile.blade.php b/resources/views/settings/profile.blade.php
index e33d31ea..90d7961d 100644
--- a/resources/views/settings/profile.blade.php
+++ b/resources/views/settings/profile.blade.php
@@ -9,7 +9,7 @@
         <div class="box__section">
             <div class="input input--small">
                 <label>{{ __('fields.avatar') }}</label>
-                <img src="{{ Auth::user()->avatar }}" style="width: 200px; height: 200px; border-radius: 5px; object-fit: cover;" />
+                <img src="{{ Auth::user()->avatar_path }}" style="width: 200px; height: 200px; border-radius: 5px; object-fit: cover;" />
                 <input type="file" name="avatar" />
                 @include('partials.validation_error', ['payload' => 'avatar'])
             </div>