diff --git a/clientapi/auth/storage/accounts/account_data_table.go b/clientapi/auth/storage/accounts/account_data_table.go
index 7b844ffa3..0a1076b57 100644
--- a/clientapi/auth/storage/accounts/account_data_table.go
+++ b/clientapi/auth/storage/accounts/account_data_table.go
@@ -122,11 +122,10 @@ func (s *accountDataStatements) selectAccountDataByType(
 	ctx context.Context, localpart, roomID, dataType string,
 ) (data *gomatrixserverlib.ClientEvent, err error) {
 	stmt := s.selectAccountDataByTypeStmt
-	row := stmt.QueryRowContext(ctx, localpart, roomID, dataType)
 
 	var content []byte
 
-	err = row.Scan(&content)
+	err = stmt.QueryRowContext(ctx, localpart, roomID, dataType).Scan(&content)
 	if err != nil {
 		return
 	}