diff --git a/app/src/leanback/java/com/fongmi/android/tv/ui/activity/VideoActivity.java b/app/src/leanback/java/com/fongmi/android/tv/ui/activity/VideoActivity.java
index 221bb3a93..29ec7629d 100644
--- a/app/src/leanback/java/com/fongmi/android/tv/ui/activity/VideoActivity.java
+++ b/app/src/leanback/java/com/fongmi/android/tv/ui/activity/VideoActivity.java
@@ -746,13 +746,14 @@ public class VideoActivity extends BaseActivity implements CustomKeyDownVod.List
     }
 
     private void onDanmu() {
+        if (mPlayers.isEnd()) return;
         Setting.putDanmu(!Setting.isDanmu());
         mBinding.control.danmu.setActivated(Setting.isDanmu());
         showDanmu();
     }
 
     private void showDanmu() {
-        if (!mPlayers.isEnd() && Setting.isDanmu()) mBinding.danmaku.show();
+        if (Setting.isDanmu()) mBinding.danmaku.show();
         else mBinding.danmaku.hide();
     }
 
diff --git a/app/src/mobile/java/com/fongmi/android/tv/ui/activity/VideoActivity.java b/app/src/mobile/java/com/fongmi/android/tv/ui/activity/VideoActivity.java
index 3e8aa6693..d0eabd6b3 100644
--- a/app/src/mobile/java/com/fongmi/android/tv/ui/activity/VideoActivity.java
+++ b/app/src/mobile/java/com/fongmi/android/tv/ui/activity/VideoActivity.java
@@ -723,13 +723,14 @@ public class VideoActivity extends BaseActivity implements Clock.Callback, Custo
     }
 
     private void onDanmu() {
+        if (mPlayers.isEnd()) return;
         Setting.putDanmu(!Setting.isDanmu());
         checkDanmuImg();
         showDanmu();
     }
 
     private void showDanmu() {
-        if (!mPlayers.isEnd() && Setting.isDanmu()) mBinding.danmaku.show();
+        if (Setting.isDanmu()) mBinding.danmaku.show();
         else mBinding.danmaku.hide();
     }