4 files changed, 8 insertions, 6 deletions
diff --git a/internal/federation/dereferencing/account.go b/internal/federation/dereferencing/account.go
index 0e7bc1cc9..6e107a11d 100644
--- a/internal/federation/dereferencing/account.go
+++ b/internal/federation/dereferencing/account.go
@@ -276,7 +276,7 @@ func (d *deref) GetRemoteAccount(ctx context.Context, params GetRemoteAccountPar
 		foundAccount.LastWebfingeredAt = fingered
 		foundAccount.UpdatedAt = time.Now()
 
-		foundAccount, err = d.db.PutAccount(ctx, foundAccount)
+		err = d.db.PutAccount(ctx, foundAccount)
 		if err != nil {
 			err = fmt.Errorf("GetRemoteAccount: error putting new account: %s", err)
 			return
@@ -338,7 +338,7 @@ func (d *deref) GetRemoteAccount(ctx context.Context, params GetRemoteAccountPar
 	}
 
 	if accountDomainChanged || sharedInboxChanged || fieldsChanged || fingeredChanged {
-		foundAccount, err = d.db.UpdateAccount(ctx, foundAccount)
+		err = d.db.UpdateAccount(ctx, foundAccount)
 		if err != nil {
 			return nil, fmt.Errorf("GetRemoteAccount: error updating remoteAccount: %s", err)
 		}
diff --git a/internal/federation/dereferencing/account_test.go b/internal/federation/dereferencing/account_test.go
index ddd9456e8..38dc615d5 100644
--- a/internal/federation/dereferencing/account_test.go
+++ b/internal/federation/dereferencing/account_test.go
@@ -107,7 +107,7 @@ func (suite *AccountTestSuite) TestDereferenceLocalAccountAsRemoteURLNoSharedInb
 	targetAccount := suite.testAccounts["local_account_2"]
 
 	targetAccount.SharedInboxURI = nil
-	if _, err := suite.db.UpdateAccount(context.Background(), targetAccount); err != nil {
+	if err := suite.db.UpdateAccount(context.Background(), targetAccount); err != nil {
 		suite.FailNow(err.Error())
 	}
 
diff --git a/internal/federation/dereferencing/status.go b/internal/federation/dereferencing/status.go
index bfbc790d8..001fe53f4 100644
--- a/internal/federation/dereferencing/status.go
+++ b/internal/federation/dereferencing/status.go
@@ -45,8 +45,10 @@ func (d *deref) EnrichRemoteStatus(ctx context.Context, username string, status
 	if err := d.populateStatusFields(ctx, status, username, includeParent); err != nil {
 		return nil, err
 	}
-
-	return d.db.UpdateStatus(ctx, status)
+	if err := d.db.UpdateStatus(ctx, status); err != nil {
+		return nil, err
+	}
+	return status, nil
 }
 
 // GetRemoteStatus completely dereferences a remote status, converts it to a GtS model status,
diff --git a/internal/federation/federatingdb/inbox_test.go b/internal/federation/federatingdb/inbox_test.go
index dbf9d3c53..f0ce38af6 100644
--- a/internal/federation/federatingdb/inbox_test.go
+++ b/internal/federation/federatingdb/inbox_test.go
@@ -68,7 +68,7 @@ func (suite *InboxTestSuite) TestInboxesForAccountIRIWithSharedInbox() {
 	testAccount := suite.testAccounts["local_account_1"]
 	sharedInbox := "http://some-inbox-iri/weeeeeeeeeeeee"
 	testAccount.SharedInboxURI = &sharedInbox
-	if _, err := suite.db.UpdateAccount(ctx, testAccount); err != nil {
+	if err := suite.db.UpdateAccount(ctx, testAccount); err != nil {
 		suite.FailNow("error updating account")
 	}