diff --git a/x/claim/keeper/msg_server_claim_arkeo.go b/x/claim/keeper/msg_server_claim_arkeo.go
index 04c32bec..a8017fca 100644
--- a/x/claim/keeper/msg_server_claim_arkeo.go
+++ b/x/claim/keeper/msg_server_claim_arkeo.go
@@ -21,79 +21,91 @@ type ThorTxData struct {
 	} `json:"observed_tx"`
 }
 
-func (k msgServer) ClaimArkeo(goCtx context.Context, msg *types.MsgClaimArkeo) (*types.MsgClaimArkeoResponse, error) {
-	ctx := sdk.UnwrapSDKContext(goCtx)
-	arkeoClaimRecord, err := k.GetClaimRecord(ctx, msg.Creator.String(), types.ARKEO)
+func (k msgServer) updateThorClaimRecord(ctx sdk.Context, creator string, thorTx string, arkeoClaimRecord types.ClaimRecord) (types.ClaimRecord, error) {
+	url := fmt.Sprintf("https://thornode.ninerealms.com/thorchain/tx/%s", thorTx)
+
+	resp, err := http.Get(url)
 	if err != nil {
-		return nil, errors.Wrapf(err, "failed to get claim record for %s", msg.Creator)
+		return types.ClaimRecord{}, errors.Wrapf(err, "failed to get thorchain tx for %s", thorTx)
 	}
+	defer resp.Body.Close()
 
-	if msg.ThorTx != "" {
-		url := fmt.Sprintf("https://thornode.ninerealms.com/thorchain/tx/%s", msg.ThorTx)
+	if resp.StatusCode != http.StatusOK {
+		return types.ClaimRecord{}, fmt.Errorf("received non-OK HTTP status: %d", resp.StatusCode)
+	}
 
-		resp, err := http.Get(url)
-		if err != nil {
-			return nil, errors.Wrapf(err, "failed to get thorchain tx for %s", msg.ThorTx)
-		}
-		defer resp.Body.Close()
+	body, err := io.ReadAll(resp.Body)
+	if err != nil {
+		return types.ClaimRecord{}, fmt.Errorf("error reading response body: %w", err)
+	}
 
-		if resp.StatusCode != http.StatusOK {
-			return nil, fmt.Errorf("received non-OK HTTP status: %d", resp.StatusCode)
-		}
+	var txData ThorTxData
+	if err := json.Unmarshal(body, &txData); err != nil {
+		return types.ClaimRecord{}, fmt.Errorf("error unmarshalling transaction data: %w", err)
+	}
+	thorAddress := txData.ObservedTx.Tx.FromAddress
+	memo := txData.ObservedTx.Tx.Memo
 
-		body, err := io.ReadAll(resp.Body)
-		if err != nil {
-			return nil, fmt.Errorf("error reading response body: %w", err)
-		}
+	thorAddressBytes, err := sdk.GetFromBech32(thorAddress, "thor")
+	if err != nil {
+		return types.ClaimRecord{}, fmt.Errorf("invalid thorchain address: %w", err)
+	}
+	prefix := sdk.GetConfig().GetBech32AccountAddrPrefix()
 
-		var txData ThorTxData
-		if err := json.Unmarshal(body, &txData); err != nil {
-			return nil, fmt.Errorf("error unmarshalling transaction data: %w", err)
-		}
-		thorAddress := txData.ObservedTx.Tx.FromAddress
-		memo := txData.ObservedTx.Tx.Memo
+	// Re-encode the raw bytes with the new prefix
+	thorDerivedArkeoAddress, err := sdk.Bech32ifyAddressBytes(prefix, thorAddressBytes)
+	if err != nil {
+		return types.ClaimRecord{}, fmt.Errorf("failed to encode address bytes with new prefix: %w", err)
+	}
 
-		thorAddressBytes, err := sdk.GetFromBech32(thorAddress, "thor")
-		if err != nil {
-			// thorAddress is invalid
-			return nil, fmt.Errorf("not a thor tx: %w", err)
-		}
-		prefix := sdk.GetConfig().GetBech32AccountAddrPrefix()
+	thorClaimRecord, err := k.GetClaimRecord(ctx, thorDerivedArkeoAddress, types.ARKEO)
+	if err != nil {
+		return types.ClaimRecord{}, errors.Wrapf(err, "failed to get claim record for %s", thorDerivedArkeoAddress)
+	}
+	if thorClaimRecord.IsEmpty() || thorClaimRecord.AmountClaim.IsZero() {
+		return types.ClaimRecord{}, errors.Wrapf(types.ErrNoClaimableAmount, "no claimable amount for %s", thorDerivedArkeoAddress)
+	}
+	parts := strings.Split(memo, ":")
+	if len(parts) != 3 || parts[0] != "delegate" || parts[1] != "arkeo" {
+		return types.ClaimRecord{}, fmt.Errorf("invalid memo: %s", memo)
+	}
 
-		// Re-encode the raw bytes with the new prefix
-		thorDerivedArkeoAddress, err := sdk.Bech32ifyAddressBytes(prefix, thorAddressBytes)
-		if err != nil {
-			return nil, fmt.Errorf("failed to encode address bytes with new prefix: %w", err)
-		}
+	combinedClaimRecord := types.ClaimRecord{
+		Chain:          types.ARKEO,
+		Address:        creator,
+		AmountClaim:    sdk.NewInt64Coin(types.DefaultClaimDenom, arkeoClaimRecord.AmountClaim.Amount.Int64()+thorClaimRecord.AmountClaim.Amount.Int64()),
+		AmountVote:     sdk.NewInt64Coin(types.DefaultClaimDenom, arkeoClaimRecord.AmountVote.Amount.Int64()+thorClaimRecord.AmountVote.Amount.Int64()),
+		AmountDelegate: sdk.NewInt64Coin(types.DefaultClaimDenom, arkeoClaimRecord.AmountDelegate.Amount.Int64()+thorClaimRecord.AmountDelegate.Amount.Int64()),
+	}
+	emptyClaimRecord := types.ClaimRecord{
+		Chain:          types.ARKEO,
+		Address:        thorDerivedArkeoAddress,
+		AmountClaim:    sdk.NewInt64Coin(types.DefaultClaimDenom, 0),
+		AmountVote:     sdk.NewInt64Coin(types.DefaultClaimDenom, 0),
+		AmountDelegate: sdk.NewInt64Coin(types.DefaultClaimDenom, 0),
+	}
+	k.SetClaimRecord(ctx, emptyClaimRecord)
+	k.SetClaimRecord(ctx, combinedClaimRecord)
 
-		thorClaimRecord, err := k.GetClaimRecord(ctx, thorDerivedArkeoAddress, types.ARKEO)
-		if err != nil {
-			return nil, errors.Wrapf(err, "failed to get claim record for %s", thorDerivedArkeoAddress)
-		}
-		if thorClaimRecord.IsEmpty() || thorClaimRecord.AmountClaim.IsZero() {
-			return nil, errors.Wrapf(types.ErrNoClaimableAmount, "no claimable amount for %s", thorDerivedArkeoAddress)
-		}
-		parts := strings.Split(memo, ":")
-		if len(parts) != 3 || parts[0] != "delegate" || parts[1] != "arkeo" {
-			return nil, fmt.Errorf("invalid memo: %s", memo)
-		}
+	newClaimRecord, err := k.GetClaimRecord(ctx, creator, types.ARKEO)
+	if err != nil {
+		return types.ClaimRecord{}, errors.Wrapf(err, "failed to get claim record for %s", creator)
+	}
+	return newClaimRecord, nil
+}
 
-		combinedClaimRecord := types.ClaimRecord{
-			Chain:          types.ARKEO,
-			Address:        msg.Creator.String(),
-			AmountClaim:    sdk.NewInt64Coin(types.DefaultClaimDenom, arkeoClaimRecord.AmountClaim.Amount.Int64()+thorClaimRecord.AmountClaim.Amount.Int64()),
-			AmountVote:     sdk.NewInt64Coin(types.DefaultClaimDenom, arkeoClaimRecord.AmountVote.Amount.Int64()+thorClaimRecord.AmountVote.Amount.Int64()),
-			AmountDelegate: sdk.NewInt64Coin(types.DefaultClaimDenom, arkeoClaimRecord.AmountDelegate.Amount.Int64()+thorClaimRecord.AmountDelegate.Amount.Int64()),
-		}
-		emptyClaimRecord := types.ClaimRecord{
-			Chain:          types.ARKEO,
-			Address:        thorDerivedArkeoAddress,
-			AmountClaim:    sdk.NewInt64Coin(types.DefaultClaimDenom, 0),
-			AmountVote:     sdk.NewInt64Coin(types.DefaultClaimDenom, 0),
-			AmountDelegate: sdk.NewInt64Coin(types.DefaultClaimDenom, 0),
+func (k msgServer) ClaimArkeo(goCtx context.Context, msg *types.MsgClaimArkeo) (*types.MsgClaimArkeoResponse, error) {
+	ctx := sdk.UnwrapSDKContext(goCtx)
+	arkeoClaimRecord, err := k.GetClaimRecord(ctx, msg.Creator.String(), types.ARKEO)
+	if err != nil {
+		return nil, errors.Wrapf(err, "failed to get claim record for %s", msg.Creator)
+	}
+
+	if msg.ThorTx != "" {
+		arkeoClaimRecord, err = k.updateThorClaimRecord(ctx, msg.Creator.String(), msg.ThorTx, arkeoClaimRecord)
+		if err != nil {
+			return nil, errors.Wrapf(err, "failed to get claim record for %s", msg.ThorTx)
 		}
-		k.SetClaimRecord(ctx, emptyClaimRecord)
-		k.SetClaimRecord(ctx, combinedClaimRecord)
 	}
 
 	if arkeoClaimRecord.IsEmpty() || arkeoClaimRecord.AmountClaim.IsZero() {