diff --git a/app/src/main/java/jp/atled/agileworks/model/DeviceInfoRepository.kt b/app/src/main/java/jp/atled/agileworks/model/DeviceInfoRepository.kt
index 95a21fcbd2c9687f285f71ad69c0dfe52f982ddb..e28f020fec33621e5c8b9a18810543b6235be6b1 100644
--- a/app/src/main/java/jp/atled/agileworks/model/DeviceInfoRepository.kt
+++ b/app/src/main/java/jp/atled/agileworks/model/DeviceInfoRepository.kt
@@ -64,18 +64,14 @@ class DeviceInfoRepository {
         }
     }
 
-    fun removeDeviceInfo(onResult: (isSuccess: Boolean) -> Unit) {
+    fun removeDeviceInfo() {
         val prefs = AwApp.instance.applicationContext.getSharedPreferences(AwApp.DEVICE_INFO_PREFERENCES, Context.MODE_PRIVATE)
         val deviceId = prefs.getInt(AwApp.DEVICE_ID, -1)
+        // ログアウト時デバイス情報削除
         if (deviceId >= 0) {
-            removeDeviceInfoInner(deviceId) {
-                prefs.edit()
-                        .clear()
-                        .apply()
-                onResult(it)
-            }
-        } else {
-            onResult(true)
+            prefs.edit()
+                .clear()
+                .apply()
         }
     }
 
diff --git a/app/src/main/java/jp/atled/agileworks/view/ui/login/LoginUtil.kt b/app/src/main/java/jp/atled/agileworks/view/ui/login/LoginUtil.kt
index 9df090fd9409138416ff88f0db5a45bf1ed1d6c4..0939db0463d1bfae7f5df6cbf5b8c21c1b492f9e 100644
--- a/app/src/main/java/jp/atled/agileworks/view/ui/login/LoginUtil.kt
+++ b/app/src/main/java/jp/atled/agileworks/view/ui/login/LoginUtil.kt
@@ -2,6 +2,7 @@ package jp.atled.agileworks.view.ui.login
 
 import android.app.Activity
 import jp.atled.agileworks.model.AuthStateRepository
+import jp.atled.agileworks.model.DeviceInfoRepository
 import jp.atled.agileworks.model.NotificationRepository
 
 object LoginUtil {
@@ -11,6 +12,7 @@ object LoginUtil {
             AuthStateRepository().clear()
             OAuthService.resetAuthState()
             onResponse(it)
+            DeviceInfoRepository().removeDeviceInfo()
         }
     }