diff --git a/clientapi/auth/storage/accounts/account_data_table.go b/clientapi/auth/storage/accounts/account_data_table.go
index 0a1076b57..2f92604a6 100644
--- a/clientapi/auth/storage/accounts/account_data_table.go
+++ b/clientapi/auth/storage/accounts/account_data_table.go
@@ -125,8 +125,7 @@ func (s *accountDataStatements) selectAccountDataByType(
 
 	var content []byte
 
-	err = stmt.QueryRowContext(ctx, localpart, roomID, dataType).Scan(&content)
-	if err != nil {
+	if err = stmt.QueryRowContext(ctx, localpart, roomID, dataType).Scan(&content); err != nil {
 		return
 	}