diff --git a/foudations/mogo-commons/src/main/java/com/mogo/commons/voice/AIAssist.java b/foudations/mogo-commons/src/main/java/com/mogo/commons/voice/AIAssist.java
index 78848a1d0a..7feae5d0bc 100644
--- a/foudations/mogo-commons/src/main/java/com/mogo/commons/voice/AIAssist.java
+++ b/foudations/mogo-commons/src/main/java/com/mogo/commons/voice/AIAssist.java
@@ -340,10 +340,11 @@ public class AIAssist implements VoiceClient.VoiceCmdCallBack, OnTtsListener {
                 callBacks.remove( callBack );
             }
             if ( callBacks.isEmpty() ) {
+                mCmdMap.remove( cmd );
+                mVoiceClient.unRegisterCustomWakeupCmd( cmd );
                 mCacheUnWakeupCommands.remove( cmd );
             }
         }
-        mVoiceClient.unRegisterCustomWakeupCmd( cmd );
     }
 
     public static void startAssistant( Context context ) {