diff --git a/app/build.gradle b/app/build.gradle
index 5136be5..bd7e69a 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -142,7 +142,8 @@ dependencies {
     implementation 'com.google.android.material:material:1.3.0'
     implementation "io.noties.markwon:core:4.6.2"
 
-    implementation ('com.rokid.security:glass3.open.sdk:2.1.7-E') {
+//    implementation ('com.rokid.security:glass3.open.sdk:2.1.7-E') {
+    implementation ('com.rokid.security:glass3.open.sdk:2.1.6-E') {
         exclude group: "org.slf4j"
     }
     implementation 'com.rokid.security.sdk:online-speech:0.1.0'
diff --git a/app/src/main/java/com/nova/brain/glass/ui/CompositeLayupResultActivity.kt b/app/src/main/java/com/nova/brain/glass/ui/CompositeLayupResultActivity.kt
index 37791e9..7958460 100644
--- a/app/src/main/java/com/nova/brain/glass/ui/CompositeLayupResultActivity.kt
+++ b/app/src/main/java/com/nova/brain/glass/ui/CompositeLayupResultActivity.kt
@@ -56,11 +56,13 @@ class CompositeLayupResultActivity : BaseActivity<ActivityCompositeLayupResultBi
     private var uiMode = UiMode.RECOGNIZE_SUCCESS
 
     private val layupWorkingRunnable: Runnable = Runnable {
+        if (isFinishing || isDestroyed) return@Runnable
         if (uiMode == UiMode.LAYUP_PROMPT) {
             applyMode(UiMode.LAYUP_WORKING)
         }
     }
     private val completeRunnable: Runnable = Runnable {
+        if (isFinishing || isDestroyed) return@Runnable
         if (uiMode == UiMode.COMPLETE) {
             goTaskList()
         }
@@ -293,6 +295,10 @@ class CompositeLayupResultActivity : BaseActivity<ActivityCompositeLayupResultBi
     }
 
     override fun onDestroy() {
+        uiHandler.removeCallbacksAndMessages(null)
+        GlassMediaServiceHelper.removePhotoCallback(photoCallback)
+        OfflineCmdServiceHelper.removeListenerCompositeLayup()
+        OfflineCmdServiceHelper.removeOnLineListener(listener)
         super.onDestroy()
         window.clearFlags(android.view.WindowManager.LayoutParams.FLAG_KEEP_SCREEN_ON)
     }
diff --git a/app/src/main/java/com/nova/brain/glass/ui/CompositeLayupTaskActivity.kt b/app/src/main/java/com/nova/brain/glass/ui/CompositeLayupTaskActivity.kt
index facf5e2..2e85086 100644
--- a/app/src/main/java/com/nova/brain/glass/ui/CompositeLayupTaskActivity.kt
+++ b/app/src/main/java/com/nova/brain/glass/ui/CompositeLayupTaskActivity.kt
@@ -59,6 +59,7 @@ class CompositeLayupTaskActivity :
         override fun getCallbackId(): String = photoCallbackId
 
         override fun onTakePhotoV2(path: String?, width: Int, height: Int) {
+            if (isFinishing || isDestroyed) return
             LogHelper.d("CompositeLayupTask onTakePhotoV2 width=$width height=$height path=$path")
             if (path == null) {
                 if (isPhoto) {
@@ -142,6 +143,9 @@ class CompositeLayupTaskActivity :
     override fun onDestroy() {
         isCaptureInFlight = false
         hasNavigatedNextPage = false
+        GlassMediaServiceHelper.removePhotoCallback(photoCallback)
+        OfflineCmdServiceHelper.removeListenerCompositeLayup()
+        OfflineCmdServiceHelper.removeOnLineListener(listener)
         super.onDestroy()
         window.clearFlags(android.view.WindowManager.LayoutParams.FLAG_KEEP_SCREEN_ON)
     }