diff --git a/src/main/java/dev/vality/daway/mapper/payment/InvoicePaymentCreatedMapper.java b/src/main/java/dev/vality/daway/mapper/payment/InvoicePaymentCreatedMapper.java
index 99ec18c3..5dc894bb 100644
--- a/src/main/java/dev/vality/daway/mapper/payment/InvoicePaymentCreatedMapper.java
+++ b/src/main/java/dev/vality/daway/mapper/payment/InvoicePaymentCreatedMapper.java
@@ -180,10 +180,14 @@ private PaymentPayerInfo getPayerPaymentInfo(InvoicePayment invoicePayment,
                 payerInfo.setFingerprint(paymentResource.getResource().getClientInfo().getFingerprint());
                 payerInfo.setPeerUserAgent(paymentResource.getResource().getClientInfo().getPeerUserAgent());
                 payerInfo.setPeerAcceptHeader(paymentResource.getResource().getClientInfo().getPeerAcceptHeader());
-                payerInfo.setDeviceInfoJson(JsonUtil.objectToJsonString(JsonUtil.thriftBaseToJsonNode(
-                        paymentResource.getResource().getClientInfo().getDeviceInfo())));
-                payerInfo.setBrowserInfoJson(JsonUtil.objectToJsonString(JsonUtil.thriftBaseToJsonNode(
-                        paymentResource.getResource().getClientInfo().getBrowserInfo())));
+                if (paymentResource.getResource().getClientInfo().isSetDeviceInfo()) {
+                    payerInfo.setDeviceInfoJson(JsonUtil.objectToJsonString(JsonUtil.thriftBaseToJsonNode(
+                            paymentResource.getResource().getClientInfo().getDeviceInfo())));
+                }
+                if (paymentResource.getResource().getClientInfo().isSetBrowserInfo()) {
+                    payerInfo.setBrowserInfoJson(JsonUtil.objectToJsonString(JsonUtil.thriftBaseToJsonNode(
+                            paymentResource.getResource().getClientInfo().getBrowserInfo())));
+                }
             }
         } else if (payer.isSetRecurrent()) {
             payerInfo.setRecurrentParentInvoiceId(payer.getRecurrent().getRecurrentParent().getInvoiceId());