diff --git a/Sources/ElixxirDAppsSDK/E2E/Functors/E2ERegisterListener.swift b/Sources/ElixxirDAppsSDK/E2E/Functors/E2ERegisterListener.swift
index 5163c559939214177f175d89449c055dd376a4a0..a2c950235acab25552916fa142bbf9a8fd522a8d 100644
--- a/Sources/ElixxirDAppsSDK/E2E/Functors/E2ERegisterListener.swift
+++ b/Sources/ElixxirDAppsSDK/E2E/Functors/E2ERegisterListener.swift
@@ -2,10 +2,10 @@ import Bindings
 import XCTestDynamicOverlay
 
 public struct E2ERegisterListener {
-  public var run: (Data, Int, Listener) throws -> Void
+  public var run: (Data?, Int, Listener) throws -> Void
 
   public func callAsFunction(
-    senderId: Data,
+    senderId: Data?,
     messageType: Int,
     callback: Listener
   ) throws {
@@ -17,7 +17,7 @@ extension E2ERegisterListener {
   public static func live(_ bindingsE2E: BindingsE2e) -> E2ERegisterListener {
     E2ERegisterListener { senderId, messageType, callback in
       try bindingsE2E.registerListener(
-        senderId,
+        senderId ?? Data([UInt8](repeating: 0, count: 32)),
         messageType: messageType,
         newListener: callback.makeBindingsListener()
       )