diff --git a/app/Avatar.php b/app/Avatar.php
index 76ca442b9..1033935bb 100644
--- a/app/Avatar.php
+++ b/app/Avatar.php
@@ -15,6 +15,7 @@ class Avatar extends Model
      * @var array
      */
     protected $dates = ['deleted_at'];
+    protected $fillable = ['profile_id'];
 
     public function profile()
     {
diff --git a/app/Http/Controllers/AvatarController.php b/app/Http/Controllers/AvatarController.php
index f8a201b87..0b46c06f9 100644
--- a/app/Http/Controllers/AvatarController.php
+++ b/app/Http/Controllers/AvatarController.php
@@ -33,7 +33,7 @@ class AvatarController extends Controller
             $currentAvatar = storage_path('app/'.$profile->avatar->media_path);
             $loc = $request->file('avatar')->storeAs($public, $name);
 
-            $avatar = Avatar::whereProfileId($profile->id)->firstOrFail();
+            $avatar = Avatar::firstOrNew(['profile_id' => $profile->id]);
             $opath = $avatar->media_path;
             $avatar->media_path = "$public/$name";
             $avatar->thumb_path = null;