diff --git a/app/Http/Controllers/PeopleController.php b/app/Http/Controllers/PeopleController.php
index f1889b7..f14236f 100644
--- a/app/Http/Controllers/PeopleController.php
+++ b/app/Http/Controllers/PeopleController.php
@@ -96,7 +96,9 @@ class PeopleController extends Controller
         // If the member states data is non-empty, save a record to the database.
         if ($person->title != 'Firma') {
             for ($i = 0; $i < sizeof(request('joining_date')); $i++) {
-                $memberState = MemberState::find(request('memberStateId')[$i]);
+                $memberState = !$person->isMember() ? 
+                               new MemberState() :
+                               $person->MemberState::find(request('memberStateId')[$i]);
 
                 $memberState->joining_date = request('joining_date')[$i];
                 $memberState->leaving_date = request('leaving_date')[$i];