diff --git a/src/main/java/dev/vality/analytics/config/SerializeConfig.java b/src/main/java/dev/vality/analytics/config/SerializeConfig.java
index 6886ad98..0eeb6752 100644
--- a/src/main/java/dev/vality/analytics/config/SerializeConfig.java
+++ b/src/main/java/dev/vality/analytics/config/SerializeConfig.java
@@ -39,7 +39,7 @@ public BinaryDeserializer<TimestampedChange> withdrawalTimestampedChangeBinaryDe
         return new AbstractThriftBinaryDeserializer<>() {
             @Override
             public TimestampedChange deserialize(byte[] bytes) {
-                return Geck.msgPackToTBase(bytes, TimestampedChange.class);
+                return deserialize(bytes, new TimestampedChange());
             }
         };
     }
diff --git a/src/main/java/dev/vality/analytics/listener/handler/withdrawal/WithdrawalEventHandler.java b/src/main/java/dev/vality/analytics/listener/handler/withdrawal/WithdrawalEventHandler.java
index cca2eaa8..42f699e7 100644
--- a/src/main/java/dev/vality/analytics/listener/handler/withdrawal/WithdrawalEventHandler.java
+++ b/src/main/java/dev/vality/analytics/listener/handler/withdrawal/WithdrawalEventHandler.java
@@ -138,13 +138,7 @@ private WithdrawalStateSnapshot getState(String withdrawalId, Map<String, Withdr
     }
 
     private TimestampedChange parse(MachineEvent machineEvent) {
-        try {
-            return withdrawalTimestampedChangeMachineEventParser.parse(machineEvent);
-        } catch (Exception e) {
-            log.warn("Failed to parse withdrawal event, sourceId={}, eventId={}",
-                    machineEvent.getSourceId(), machineEvent.getEventId(), e);
-            return null;
-        }
+        return withdrawalTimestampedChangeMachineEventParser.parse(machineEvent);
     }
 
     private String resolveWithdrawalId(MachineEvent machineEvent) {
diff --git a/src/test/java/dev/vality/analytics/utils/WithdrawalEventTestUtils.java b/src/test/java/dev/vality/analytics/utils/WithdrawalEventTestUtils.java
index 76eaaadb..2d3852da 100644
--- a/src/test/java/dev/vality/analytics/utils/WithdrawalEventTestUtils.java
+++ b/src/test/java/dev/vality/analytics/utils/WithdrawalEventTestUtils.java
@@ -23,10 +23,12 @@
 import dev.vality.fistful.withdrawal.status.Status;
 import dev.vality.fistful.withdrawal.status.Succeeded;
 import dev.vality.geck.common.util.TypeUtil;
-import dev.vality.geck.serializer.Geck;
 import dev.vality.machinegun.eventsink.MachineEvent;
 import dev.vality.machinegun.eventsink.SinkEvent;
 import org.apache.thrift.TBase;
+import org.apache.thrift.TException;
+import org.apache.thrift.TSerializer;
+import org.apache.thrift.protocol.TBinaryProtocol;
 
 import java.time.Instant;
 import java.util.List;
@@ -117,7 +119,7 @@ public static MachineEvent machineEvent(long eventId, TimestampedChange timestam
                 .setSourceId(WITHDRAWAL_ID)
                 .setEventId(eventId)
                 .setCreatedAt(TypeUtil.temporalToString(Instant.parse(OCCURRED_AT)))
-                .setData(dev.vality.machinegun.msgpack.Value.bin(Geck.toMsgPack(timestampedChange)));
+                .setData(dev.vality.machinegun.msgpack.Value.bin(serialize(timestampedChange)));
     }
 
     public static SinkEvent sinkEvent(long eventId, TimestampedChange timestampedChange) {
@@ -173,4 +175,12 @@ private static FinalCashFlowPosting posting(CashFlowAccount source, CashFlowAcco
                 .setDestination(new FinalCashFlowAccount().setAccountType(destination))
                 .setVolume(new Cash().setAmount(amount).setCurrency(new CurrencyRef(CURRENCY)));
     }
+
+    private static byte[] serialize(TBase<?, ?> thriftValue) {
+        try {
+            return new TSerializer(new TBinaryProtocol.Factory()).serialize(thriftValue);
+        } catch (TException e) {
+            throw new IllegalStateException("Failed to serialize withdrawal test event", e);
+        }
+    }
 }