diff --git a/clientapi/routing/account_data.go b/clientapi/routing/account_data.go
index 19f08888e..4f7e8a106 100644
--- a/clientapi/routing/account_data.go
+++ b/clientapi/routing/account_data.go
@@ -92,8 +92,7 @@ func SaveAccountData(
 		return httputil.LogThenError(req, err)
 	}
 
-	var rawJson json.RawMessage
-	if err = json.Unmarshal(body, &rawJson); err != nil {
+	if !json.Valid(body) {
 		return util.JSONResponse{
 			Code: http.StatusBadRequest,
 			JSON: jsonerror.BadJSON("Bad JSON content"),