diff --git a/liblogosdelivery/declare_lib.nim b/liblogosdelivery/declare_lib.nim
index 98209c649..5087a0dee 100644
--- a/liblogosdelivery/declare_lib.nim
+++ b/liblogosdelivery/declare_lib.nim
@@ -1,8 +1,12 @@
 import ffi
+import std/locks
 import waku/factory/waku
 
 declareLibrary("logosdelivery")
 
+var eventCallbackLock: Lock
+initLock(eventCallbackLock)
+
 template requireInitializedNode*(
     ctx: ptr FFIContext[Waku], opName: string, onError: untyped
 ) =
@@ -20,5 +24,10 @@ proc logosdelivery_set_event_callback(
     echo "error: invalid context in logosdelivery_set_event_callback"
     return
 
+  # prevent race conditions that might happen due incorrect usage.
+  eventCallbackLock.acquire()
+  defer:
+    eventCallbackLock.release()
+
   ctx[].eventCallback = cast[pointer](callback)
   ctx[].eventUserData = userData
diff --git a/liblogosdelivery/liblogosdelivery.nim b/liblogosdelivery/liblogosdelivery.nim
index 7d068b065..b6a4c0bda 100644
--- a/liblogosdelivery/liblogosdelivery.nim
+++ b/liblogosdelivery/liblogosdelivery.nim
@@ -5,25 +5,3 @@ import waku/factory/waku, waku/node/waku_node, ./declare_lib
 ################################################################################
 ## Include different APIs, i.e. all procs with {.ffi.} pragma
 include ./logos_delivery_api/node_api, ./logos_delivery_api/messaging_api
-
-################################################################################
-### Exported procs
-
-proc logosdelivery_destroy(
-    ctx: ptr FFIContext[Waku], callback: FFICallBack, userData: pointer
-): cint {.dynlib, exportc, cdecl.} =
-  initializeLibrary()
-  checkParams(ctx, callback, userData)
-
-  ffi.destroyFFIContext(ctx).isOkOr:
-    let msg = "liblogosdelivery error: " & $error
-    callback(RET_ERR, unsafeAddr msg[0], cast[csize_t](len(msg)), userData)
-    return RET_ERR
-
-  ## always need to invoke the callback although we don't retrieve value to the caller
-  callback(RET_OK, nil, 0, userData)
-
-  return RET_OK
-
-# ### End of exported procs
-# ################################################################################
diff --git a/liblogosdelivery/logos_delivery_api/node_api.nim b/liblogosdelivery/logos_delivery_api/node_api.nim
index 6a0041857..cfa86fe36 100644
--- a/liblogosdelivery/logos_delivery_api/node_api.nim
+++ b/liblogosdelivery/logos_delivery_api/node_api.nim
@@ -29,6 +29,22 @@ registerReqFFI(CreateNodeRequest, ctx: ptr FFIContext[Waku]):
 
     return ok("")
 
+proc logosdelivery_destroy(
+    ctx: ptr FFIContext[Waku], callback: FFICallBack, userData: pointer
+): cint {.dynlib, exportc, cdecl.} =
+  initializeLibrary()
+  checkParams(ctx, callback, userData)
+
+  ffi.destroyFFIContext(ctx).isOkOr:
+    let msg = "liblogosdelivery error: " & $error
+    callback(RET_ERR, unsafeAddr msg[0], cast[csize_t](len(msg)), userData)
+    return RET_ERR
+
+  ## always need to invoke the callback although we don't retrieve value to the caller
+  callback(RET_OK, nil, 0, userData)
+
+  return RET_OK
+
 proc logosdelivery_create_node(
     configJson: cstring, callback: FFICallback, userData: pointer
 ): pointer {.dynlib, exportc, cdecl.} =
@@ -50,6 +66,9 @@ proc logosdelivery_create_node(
   ).isOkOr:
     let msg = "error in sendRequestToFFIThread: " & $error
     callback(RET_ERR, unsafeAddr msg[0], cast[csize_t](len(msg)), userData)
+    # free allocated resources as they won't be available
+    ffi.destroyFFIContext(ctx).isOkOr:
+      chronicles.error "Error in destroyFFIContext after sendRequestToFFIThread during creation", err = $error
     return nil
 
   return ctx