diff --git a/src/android/org/linphone/LinphoneManager.java b/src/android/org/linphone/LinphoneManager.java
index eeb2d007c..f6b5026f7 100644
--- a/src/android/org/linphone/LinphoneManager.java
+++ b/src/android/org/linphone/LinphoneManager.java
@@ -803,10 +803,18 @@ public class LinphoneManager implements LinphoneCoreListener, LinphoneChatMessag
 				Log.i("[Push Notification] Assuming GCM jar is not provided.");
 			}
 		}else if (getString(R.string.push_type).equals("firebase")){
-			final String refreshedToken = FirebaseInstanceId.getInstance().getToken();
-			if (refreshedToken != null) {
-				Log.i("[Push Notification] current token is: " + refreshedToken);
-				LinphonePreferences.instance().setPushNotificationRegistrationID(refreshedToken);
+			try{
+				Class<?> firebaseClass = Class.forName("com.google.firebase.iid.FirebaseInstanceId");
+				Object firebaseInstance = firebaseClass.getMethod("getInstance").invoke(null);
+				final String refreshedToken = (String)firebaseClass.getMethod("getToken").invoke(firebaseInstance);
+			
+				//final String refreshedToken = com.google.firebase.iid.FirebaseInstanceId.getInstance().getToken();
+				if (refreshedToken != null) {
+					Log.i("[Push Notification] current token is: " + refreshedToken);
+					LinphonePreferences.instance().setPushNotificationRegistrationID(refreshedToken);
+				}
+			}catch(Exception e){
+				Log.i("[Push Notification] firebase not available.");
 			}
 		}
 	}
diff --git a/src/android/org/linphone/firebase/FirebaseIdService.java b/src/android/org/linphone/firebase/FirebaseIdService.java
index a48ce0dcd..eacaf3b21 100644
--- a/src/android/org/linphone/firebase/FirebaseIdService.java
+++ b/src/android/org/linphone/firebase/FirebaseIdService.java
@@ -33,7 +33,7 @@ public class FirebaseIdService extends FirebaseInstanceIdService {
         final String refreshedToken = FirebaseInstanceId.getInstance().getToken();
         android.util.Log.i("FirebaseIdService", "[Push Notification] Refreshed token: " + refreshedToken);
 
-        LinphoneUtils.dispatchOnUIThread(new Runnable() {
+        UIThreadDispatcher.dispatch(new Runnable() {
             @Override
             public void run() {
                 LinphonePreferences.instance().setPushNotificationRegistrationID(refreshedToken);