diff --git a/erpc_c/setup/erpc_arbitrated_client_setup.cpp b/erpc_c/setup/erpc_arbitrated_client_setup.cpp
index 0293e5e20..46a4bf90f 100644
--- a/erpc_c/setup/erpc_arbitrated_client_setup.cpp
+++ b/erpc_c/setup/erpc_arbitrated_client_setup.cpp
@@ -224,9 +224,9 @@ void erpc_arbitrated_client_deinit(erpc_client_t client)
 {
 #if ERPC_ALLOCATION_POLICY == ERPC_ALLOCATION_POLICY_STATIC
     (void)client;
-    erpc_assert(client == client.get());
+    erpc_assert(client == s_client.get());
     s_codecFactory.destroy();
-    crc16.destroy();
+    s_crc16.destroy();
     s_codec.destroy();
     s_arbitrator.destroy();
     s_client.destroy();
diff --git a/erpc_c/setup/erpc_client_setup.cpp b/erpc_c/setup/erpc_client_setup.cpp
index dfa2d9901..66de981e9 100644
--- a/erpc_c/setup/erpc_client_setup.cpp
+++ b/erpc_c/setup/erpc_client_setup.cpp
@@ -185,7 +185,7 @@ void erpc_client_deinit(erpc_client_t client)
     (void)client;
     erpc_assert(client == s_client.get());
     s_codecFactory.destroy();
-    crc16.destroy();
+    s_crc16.destroy();
     s_client.destroy();
 #elif ERPC_ALLOCATION_POLICY == ERPC_ALLOCATION_POLICY_DYNAMIC
     erpc_assert(client != NULL);