diff --git a/internal/federation/dereferencing/status.go b/internal/federation/dereferencing/status.go
index 06fe5a24e..edf1f0e41 100644
--- a/internal/federation/dereferencing/status.go
+++ b/internal/federation/dereferencing/status.go
@@ -357,7 +357,7 @@ func (d *deref) populateStatusMentions(ctx context.Context, status *gtsmodel.Sta
 			Status:           m.Status,
 			CreatedAt:        status.CreatedAt,
 			UpdatedAt:        status.UpdatedAt,
-			OriginAccountID:  status.Account.ID,
+			OriginAccountID:  status.AccountID,
 			OriginAccountURI: status.AccountURI,
 			OriginAccount:    status.Account,
 			TargetAccountID:  targetAccount.ID,
diff --git a/internal/processing/fromfederator_test.go b/internal/processing/fromfederator_test.go
index c9792ee24..c58334787 100644
--- a/internal/processing/fromfederator_test.go
+++ b/internal/processing/fromfederator_test.go
@@ -99,7 +99,6 @@ func (suite *FromFederatorTestSuite) TestProcessReplyMention() {
 			},
 		},
 		AccountID:           replyingAccount.ID,
-		Account:             replyingAccount,
 		AccountURI:          replyingAccount.URI,
 		InReplyToID:         repliedStatus.ID,
 		InReplyToURI:        repliedStatus.URI,