diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 12a07220..798eb6cf 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -268,15 +268,6 @@
             </intent-filter>
         </service>
 
-        <service
-            android:name=".MyFirebaseInstanceIDService"
-            tools:ignore="ExportedService"
-            >
-            <intent-filter>
-                <action android:name="com.google.firebase.INSTANCE_ID_EVENT"/>
-            </intent-filter>
-        </service>
-
         <!-- Set custom default icon. This is used when no icon is set for incoming notification messages.
      See README(https://goo.gl/l4GJaQ) for more. -->
         <meta-data
diff --git a/app/src/main/java/jp/juggler/subwaytooter/MyFirebaseInstanceIDService.kt b/app/src/main/java/jp/juggler/subwaytooter/MyFirebaseInstanceIDService.kt
index 344f2f5c..03f12ebb 100644
--- a/app/src/main/java/jp/juggler/subwaytooter/MyFirebaseInstanceIDService.kt
+++ b/app/src/main/java/jp/juggler/subwaytooter/MyFirebaseInstanceIDService.kt
@@ -15,17 +15,6 @@ class MyFirebaseInstanceIDService : FirebaseInstanceIdService() {
 	override fun onTokenRefresh() {
 		super.onTokenRefresh()
 		
-		try {
-			val token = FirebaseInstanceId.getInstance().token
-			log.d("onTokenRefresh: instance_token=%s", token)
-			
-			PrefDevice.prefDevice(this).edit().putString(PrefDevice.KEY_DEVICE_TOKEN, token).apply()
-			
-			PollingWorker.queueFCMTokenUpdated(this)
-			
-		} catch(ex : Throwable) {
-			log.trace(ex)
-		}
 		
 	}
 	
diff --git a/app/src/main/java/jp/juggler/subwaytooter/MyFirebaseMessagingService.kt b/app/src/main/java/jp/juggler/subwaytooter/MyFirebaseMessagingService.kt
index 1df63d4f..37d1e3a4 100644
--- a/app/src/main/java/jp/juggler/subwaytooter/MyFirebaseMessagingService.kt
+++ b/app/src/main/java/jp/juggler/subwaytooter/MyFirebaseMessagingService.kt
@@ -2,6 +2,7 @@ package jp.juggler.subwaytooter
 
 import android.content.Intent
 import android.os.Build
+import com.google.firebase.iid.FirebaseInstanceId
 
 import com.google.firebase.messaging.FirebaseMessagingService
 import com.google.firebase.messaging.RemoteMessage
@@ -39,4 +40,19 @@ class MyFirebaseMessagingService : FirebaseMessagingService() {
 			context.startService(intent)
 		}
 	}
+	
+	override fun onNewToken(token : String?) {
+		try {
+			token?: return
+			log.d("onTokenRefresh: token=%s", token)
+			PrefDevice.prefDevice(this).edit().putString(PrefDevice.KEY_DEVICE_TOKEN, token).apply()
+
+			
+			
+			PollingWorker.queueFCMTokenUpdated(this)
+			
+		} catch(ex : Throwable) {
+			log.trace(ex)
+		}
+	}
 }
diff --git a/app/src/main/java/jp/juggler/subwaytooter/PollingWorker.kt b/app/src/main/java/jp/juggler/subwaytooter/PollingWorker.kt
index ac8344ab..2cff4ea7 100644
--- a/app/src/main/java/jp/juggler/subwaytooter/PollingWorker.kt
+++ b/app/src/main/java/jp/juggler/subwaytooter/PollingWorker.kt
@@ -61,6 +61,9 @@ class PollingWorker private constructor(c : Context) {
 	companion object {
 		internal val log = LogCategory("PollingWorker")
 		
+		private const val FCM_SENDER_ID ="433682361381"
+		private const val FCM_SCOPE = "FCM"
+
 		const val NOTIFICATION_ID = 1
 		const val NOTIFICATION_ID_ERROR = 3
 		
@@ -112,15 +115,21 @@ class PollingWorker private constructor(c : Context) {
 			return s
 		}
 		
+		
+		
 		fun getDeviceId(context : Context) : String? {
+			// 設定ファイルに保持されていたらそれを使う
 			val prefDevice = PrefDevice.prefDevice(context)
 			var device_token = prefDevice.getString(PrefDevice.KEY_DEVICE_TOKEN, null)
 			if(device_token?.isNotEmpty() == true) return device_token
 			
 			try {
-				device_token = FirebaseInstanceId.getInstance().token
+				// FirebaseのAPIから取得する
+				device_token = FirebaseInstanceId.getInstance().getToken(FCM_SENDER_ID,FCM_SCOPE)
 				if(device_token?.isNotEmpty() == true) {
-					prefDevice.edit().putString(PrefDevice.KEY_DEVICE_TOKEN, device_token)
+					prefDevice
+						.edit()
+						.putString(PrefDevice.KEY_DEVICE_TOKEN, device_token)
 						.apply()
 					return device_token
 				}
@@ -143,26 +152,25 @@ class PollingWorker private constructor(c : Context) {
 			
 			var sv = prefDevice.getString(PrefDevice.KEY_INSTALL_ID, null)
 			if(sv?.isNotEmpty() == true) return sv
+
 			SavedAccount.clearRegistrationCache()
 			
 			try {
 				var device_token = prefDevice.getString(PrefDevice.KEY_DEVICE_TOKEN, null)
-				if(device_token == null || device_token.isEmpty()) {
+				if(device_token?.isEmpty() != false ) {
 					try {
-						device_token = FirebaseInstanceId.getInstance().token
+						device_token = FirebaseInstanceId.getInstance().getToken(FCM_SENDER_ID,FCM_SCOPE)
 						if(device_token == null || device_token.isEmpty()) {
 							log.e("getInstallId: missing device token.")
 							return null
 						} else {
-							prefDevice.edit().putString(PrefDevice.KEY_DEVICE_TOKEN, device_token)
-								.apply()
+							prefDevice.edit().putString(PrefDevice.KEY_DEVICE_TOKEN, device_token).apply()
 						}
 					} catch(ex : Throwable) {
 						log.e("getInstallId: could not get device token.")
 						log.trace(ex)
 						return null
 					}
-					
 				}
 				
 				val request = Request.Builder()
@@ -857,12 +865,12 @@ class PollingWorker private constructor(c : Context) {
 					TASK_BOOT_COMPLETED -> NotificationTracking.resetPostAll()
 					
 					TASK_PACKAGE_REPLACED -> NotificationTracking.resetPostAll()
-				
-				// デバイストークンが更新された
+					
+					// デバイストークンが更新された
 					TASK_FCM_DEVICE_TOKEN -> {
 					}
-				
-				// プッシュ通知が届いた
+					
+					// プッシュ通知が届いた
 					TASK_FCM_MESSAGE -> {
 						var bDone = false
 						val tag = taskData.parseString(EXTRA_TAG)
@@ -1097,11 +1105,11 @@ class PollingWorker private constructor(c : Context) {
 					
 					client.account = account
 					
-					val wps = PushSubscriptionHelper(context,account)
-					if( wps.flags != 0) {
+					val wps = PushSubscriptionHelper(context, account)
+					if(wps.flags != 0) {
 						job.bPollingRequired.set(true)
 					}
-
+					
 					wps.updateSubscription(client)
 					val wps_log = wps.log
 					if(wps_log.isNotEmpty()) {