diff --git a/android/hal-audio.c b/android/hal-audio.c
index 52f8894..6104183 100644
--- a/android/hal-audio.c
+++ b/android/hal-audio.c
@@ -1378,7 +1378,8 @@ static void *ipc_handler(void *data)
 		}
 	}
 
-	unregister_endpoints();
+	/* audio_sk is closed at this point, just cleanup endpoints states */
+	memset(audio_endpoints, 0, sizeof(audio_endpoints));
 
 	info("Closing Audio IPC thread");
 	return NULL;