diff --git a/android/hal-a2dp-sink.c b/android/hal-a2dp-sink.c
index 001b022..a0b7ed1 100644
--- a/android/hal-a2dp-sink.c
+++ b/android/hal-a2dp-sink.c
@@ -139,14 +139,14 @@ static void cleanup(void)
 	if (!interface_ready())
 		return;
 
-	cbs = NULL;
-
 	cmd.service_id = HAL_SERVICE_ID_A2DP_SINK;
 
 	hal_ipc_cmd(HAL_SERVICE_ID_CORE, HAL_OP_UNREGISTER_MODULE,
 					sizeof(cmd), &cmd, NULL, NULL, NULL);
 
 	hal_ipc_unregister(HAL_SERVICE_ID_A2DP_SINK);
+
+	cbs = NULL;
 }
 
 static btav_interface_t iface = {
diff --git a/android/hal-a2dp.c b/android/hal-a2dp.c
index ca92b0e..f572875 100644
--- a/android/hal-a2dp.c
+++ b/android/hal-a2dp.c
@@ -141,14 +141,14 @@ static void cleanup(void)
 	if (!interface_ready())
 		return;
 
-	cbs = NULL;
-
 	cmd.service_id = HAL_SERVICE_ID_A2DP;
 
 	hal_ipc_cmd(HAL_SERVICE_ID_CORE, HAL_OP_UNREGISTER_MODULE,
 					sizeof(cmd), &cmd, NULL, NULL, NULL);
 
 	hal_ipc_unregister(HAL_SERVICE_ID_A2DP);
+
+	cbs = NULL;
 }
 
 static btav_interface_t iface = {
diff --git a/android/hal-avrcp-ctrl.c b/android/hal-avrcp-ctrl.c
index 9ae4631..46b77fd 100644
--- a/android/hal-avrcp-ctrl.c
+++ b/android/hal-avrcp-ctrl.c
@@ -122,14 +122,14 @@ static void cleanup(void)
 	if (!interface_ready())
 		return;
 
-	cbs = NULL;
-
 	cmd.service_id = HAL_SERVICE_ID_AVRCP_CTRL;
 
 	hal_ipc_cmd(HAL_SERVICE_ID_CORE, HAL_OP_UNREGISTER_MODULE,
 					sizeof(cmd), &cmd, NULL, NULL, NULL);
 
 	hal_ipc_unregister(HAL_SERVICE_ID_AVRCP_CTRL);
+
+	cbs = NULL;
 }
 
 static btrc_ctrl_interface_t iface = {
diff --git a/android/hal-avrcp.c b/android/hal-avrcp.c
index 6c7f195..f935eda 100644
--- a/android/hal-avrcp.c
+++ b/android/hal-avrcp.c
@@ -656,14 +656,14 @@ static void cleanup(void)
 	if (!interface_ready())
 		return;
 
-	cbs = NULL;
-
 	cmd.service_id = HAL_SERVICE_ID_AVRCP;
 
 	hal_ipc_cmd(HAL_SERVICE_ID_CORE, HAL_OP_UNREGISTER_MODULE,
 					sizeof(cmd), &cmd, NULL, NULL, NULL);
 
 	hal_ipc_unregister(HAL_SERVICE_ID_AVRCP);
+
+	cbs = NULL;
 }
 
 static btrc_interface_t iface = {
diff --git a/android/hal-bluetooth.c b/android/hal-bluetooth.c
index cceb196..fac6b6f 100644
--- a/android/hal-bluetooth.c
+++ b/android/hal-bluetooth.c
@@ -591,9 +591,9 @@ static void cleanup(void)
 
 	hal_ipc_cleanup();
 
-	bt_hal_cbacks = NULL;
-
 	hal_ipc_unregister(HAL_SERVICE_ID_BLUETOOTH);
+
+	bt_hal_cbacks = NULL;
 }
 
 static int get_adapter_properties(void)
diff --git a/android/hal-gatt.c b/android/hal-gatt.c
index 73fa881..d06164e 100644
--- a/android/hal-gatt.c
+++ b/android/hal-gatt.c
@@ -1978,14 +1978,14 @@ static void cleanup(void)
 	if (!interface_ready())
 		return;
 
-	cbs = NULL;
-
 	cmd.service_id = HAL_SERVICE_ID_GATT;
 
 	hal_ipc_cmd(HAL_SERVICE_ID_CORE, HAL_OP_UNREGISTER_MODULE,
 					sizeof(cmd), &cmd, NULL, NULL, NULL);
 
 	hal_ipc_unregister(HAL_SERVICE_ID_GATT);
+
+	cbs = NULL;
 }
 
 static btgatt_client_interface_t client_iface = {
diff --git a/android/hal-handsfree-client.c b/android/hal-handsfree-client.c
index 66b5df4..93b5746 100644
--- a/android/hal-handsfree-client.c
+++ b/android/hal-handsfree-client.c
@@ -616,14 +616,14 @@ static void cleanup(void)
 	if (!interface_ready())
 		return;
 
-	cbs = NULL;
-
 	cmd.service_id = HAL_SERVICE_ID_HANDSFREE_CLIENT;
 
 	hal_ipc_cmd(HAL_SERVICE_ID_CORE, HAL_OP_UNREGISTER_MODULE,
 					sizeof(cmd), &cmd, NULL, NULL, NULL);
 
 	hal_ipc_unregister(HAL_SERVICE_ID_HANDSFREE_CLIENT);
+
+	cbs = NULL;
 }
 
 static bthf_client_interface_t iface = {
diff --git a/android/hal-handsfree.c b/android/hal-handsfree.c
index e2cfc39..2c638e6 100644
--- a/android/hal-handsfree.c
+++ b/android/hal-handsfree.c
@@ -819,14 +819,14 @@ static void cleanup(void)
 	if (!interface_ready())
 		return;
 
-	cbs = NULL;
-
 	cmd.service_id = HAL_SERVICE_ID_HANDSFREE;
 
 	hal_ipc_cmd(HAL_SERVICE_ID_CORE, HAL_OP_UNREGISTER_MODULE,
 					sizeof(cmd), &cmd, NULL, NULL, NULL);
 
 	hal_ipc_unregister(HAL_SERVICE_ID_HANDSFREE);
+
+	cbs = NULL;
 }
 
 #if ANDROID_VERSION >= PLATFORM_VER(5, 0, 0)
diff --git a/android/hal-health.c b/android/hal-health.c
index 8462736..5d5b111 100644
--- a/android/hal-health.c
+++ b/android/hal-health.c
@@ -271,14 +271,14 @@ static void cleanup(void)
 	if (!interface_ready())
 		return;
 
-	cbacks = NULL;
-
 	cmd.service_id = HAL_SERVICE_ID_HEALTH;
 
 	hal_ipc_cmd(HAL_SERVICE_ID_CORE, HAL_OP_UNREGISTER_MODULE,
 					sizeof(cmd), &cmd, NULL, NULL, NULL);
 
 	hal_ipc_unregister(HAL_SERVICE_ID_HEALTH);
+
+	cbacks = NULL;
 }
 
 static bthl_interface_t health_if = {
diff --git a/android/hal-hidhost.c b/android/hal-hidhost.c
index 3cfc6b6..1a60326 100644
--- a/android/hal-hidhost.c
+++ b/android/hal-hidhost.c
@@ -373,14 +373,14 @@ static void cleanup(void)
 	if (!interface_ready())
 		return;
 
-	cbacks = NULL;
-
 	cmd.service_id = HAL_SERVICE_ID_HIDHOST;
 
 	hal_ipc_cmd(HAL_SERVICE_ID_CORE, HAL_OP_UNREGISTER_MODULE,
 					sizeof(cmd), &cmd, NULL, NULL, NULL);
 
 	hal_ipc_unregister(HAL_SERVICE_ID_HIDHOST);
+
+	cbacks = NULL;
 }
 
 static bthh_interface_t hidhost_if = {
diff --git a/android/hal-pan.c b/android/hal-pan.c
index cd783bc..61d44a9 100644
--- a/android/hal-pan.c
+++ b/android/hal-pan.c
@@ -184,14 +184,14 @@ static void pan_cleanup(void)
 	if (!interface_ready())
 		return;
 
-	cbs = NULL;
-
 	cmd.service_id = HAL_SERVICE_ID_PAN;
 
 	hal_ipc_cmd(HAL_SERVICE_ID_CORE, HAL_OP_UNREGISTER_MODULE,
 					sizeof(cmd), &cmd, NULL, NULL, NULL);
 
 	hal_ipc_unregister(HAL_SERVICE_ID_PAN);
+
+	cbs = NULL;
 }
 
 static btpan_interface_t pan_if = {