diff --git a/src/JsonApiDotNetCore/Models/JsonApiDocuments/ErrorMeta.cs b/src/JsonApiDotNetCore/Models/JsonApiDocuments/ErrorMeta.cs
index f271924768..6d09bd627c 100644
--- a/src/JsonApiDotNetCore/Models/JsonApiDocuments/ErrorMeta.cs
+++ b/src/JsonApiDotNetCore/Models/JsonApiDocuments/ErrorMeta.cs
@@ -15,8 +15,15 @@ public sealed class ErrorMeta
 
         public void IncludeExceptionStackTrace(Exception exception)
         {
-            Data["StackTrace"] = exception?.Demystify().ToString()
-                .Split(new[] {"\n"}, int.MaxValue, StringSplitOptions.RemoveEmptyEntries);
+            if (exception == null)
+            {
+                Data.Remove("StackTrace");
+            }
+            else
+            {
+                Data["StackTrace"] = exception.Demystify().ToString()
+                    .Split(new[] { "\n" }, int.MaxValue, StringSplitOptions.RemoveEmptyEntries);
+            }
         }
     }
 }
diff --git a/src/JsonApiDotNetCore/Services/DefaultResourceService.cs b/src/JsonApiDotNetCore/Services/DefaultResourceService.cs
index e277f21d65..9df4450cfc 100644
--- a/src/JsonApiDotNetCore/Services/DefaultResourceService.cs
+++ b/src/JsonApiDotNetCore/Services/DefaultResourceService.cs
@@ -213,7 +213,7 @@ public virtual async Task<TResource> UpdateAsync(TId id, TResource requestEntity
             }
 
             _repository.FlushFromCache(databaseEntity);
-            TResource afterEntity = await _repository.Get(databaseEntity.Id).FirstOrDefaultAsync();
+            TResource afterEntity = await _repository.Get(id).FirstOrDefaultAsync();
             _resourceChangeTracker.SetFinallyStoredAttributeValues(afterEntity);
 
             bool hasImplicitChanges = _resourceChangeTracker.HasImplicitChanges();