diff --git a/app/src/main/java/jp/atled/agileworks/model/NotificationRepository.kt b/app/src/main/java/jp/atled/agileworks/model/NotificationRepository.kt
index 045df278cdef0a95a999d3107892f7b2c0f0bc45..05d937f1b88ee165deb5d12e60887d3a9340353a 100644
--- a/app/src/main/java/jp/atled/agileworks/model/NotificationRepository.kt
+++ b/app/src/main/java/jp/atled/agileworks/model/NotificationRepository.kt
@@ -40,10 +40,20 @@ class NotificationRepository(_serverNumber: Int? = null) {
         Log.d("AgileWorks", "firebase token clean")
         ApiClient.reCreateLogout()
         LogoutRepository.getInstance().getLogout {
+            /*
             FcmRepository().removeFcmToken {
                 Log.d("AgileWorks", "firebase token clean -> ${successOrFailured(it)}")
                 onResult(it)
             }
+            */
+            // 全サーバログアウト状態で FcmToken の削除
+            val serverList = ServerRepository().loadServerList()
+            if (serverList.isEmpty()) {
+                FcmRepository().removeFcmToken {
+                    Log.d("AgileWorks", "firebase token clean -> ${successOrFailured(it)}")
+                }
+            }
+            onResult(it)
         }
     }
 
diff --git a/app/src/main/java/jp/atled/agileworks/view/ui/documentweb/DocumentWebFragment.kt b/app/src/main/java/jp/atled/agileworks/view/ui/documentweb/DocumentWebFragment.kt
index ca0afce914053064eee8139a02ca61e6c4b7eb9e..d63b84234e26d1af853582e2855fac2cc461bcc7 100644
--- a/app/src/main/java/jp/atled/agileworks/view/ui/documentweb/DocumentWebFragment.kt
+++ b/app/src/main/java/jp/atled/agileworks/view/ui/documentweb/DocumentWebFragment.kt
@@ -22,10 +22,7 @@ import androidx.lifecycle.lifecycleScope
 import jp.atled.agileworks.R
 import jp.atled.agileworks.AwApp
 import jp.atled.agileworks.databinding.FragmentWebviewDetailBinding
-import jp.atled.agileworks.model.AppRepository
-import jp.atled.agileworks.model.LoginRepository
-import jp.atled.agileworks.model.ServerRepository
-import jp.atled.agileworks.model.SessionRepository
+import jp.atled.agileworks.model.*
 import jp.atled.agileworks.view.base.BaseViewModel
 import kotlinx.android.synthetic.main.fragment_webview_detail.*
 import kotlinx.coroutines.flow.collect