From a117143ca1322cefd1508b7e022382b8d983415c Mon Sep 17 00:00:00 2001
From: gabrielmer <101006718+gabrielmer@users.noreply.github.com>
Date: Wed, 5 Feb 2025 18:16:37 +0200
Subject: [PATCH] fix: avoid sending relay callbacks if relay is disabled
 (#3276)

---
 .../requests/node_lifecycle_request.nim                      | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/library/waku_thread/inter_thread_communication/requests/node_lifecycle_request.nim b/library/waku_thread/inter_thread_communication/requests/node_lifecycle_request.nim
index 087a78d3e..9bd0017ab 100644
--- a/library/waku_thread/inter_thread_communication/requests/node_lifecycle_request.nim
+++ b/library/waku_thread/inter_thread_communication/requests/node_lifecycle_request.nim
@@ -67,6 +67,11 @@ proc createWaku(
             formattedString & ". expected type: " & $typeof(confValue)
         )
 
+  # Don't send relay app callbacks if relay is disabled
+  if not conf.relay and not appCallbacks.isNil():
+    appCallbacks.relayHandler = nil
+    appCallbacks.topicHealthChangeHandler = nil
+
   let wakuRes = Waku.new(conf, appCallbacks).valueOr:
     error "waku initialization failed", error = error
     return err("Failed setting up Waku: " & $error)