diff --git a/src/com/dsi/ant/hidl/HidlClient.java b/src/com/dsi/ant/hidl/HidlClient.java
index c99c780..5ebbf14 100644
--- a/src/com/dsi/ant/hidl/HidlClient.java
+++ b/src/com/dsi/ant/hidl/HidlClient.java
@@ -208,6 +208,7 @@
                 if (status != 0) {
                     Log.w(TAG, "Failed to disable ANT: " + mHidl.translateStatus(status));
                 }
+                cleanupHidl();
             } catch (RemoteException e) {
                 Log.w(TAG, "Server died in disable", e);
                 handleServerDeath();