diff --git a/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/Mapbox.java b/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/Mapbox.java
index c8b6701b..f116c8f3 100644
--- a/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/Mapbox.java
+++ b/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/Mapbox.java
@@ -216,7 +216,7 @@ static boolean isAccessTokenValid(@Nullable String accessToken) {
     }
 
     accessToken = accessToken.trim().toLowerCase(MapboxConstants.MAPBOX_LOCALE);
-    return accessToken.length() != 0 && (accessToken.startsWith("pk.") || accessToken.startsWith("sk."));
+    return accessToken.length() > 0 && accessToken.matches("^(pk|sk|tk)\\..*");
   }
 
   /**
diff --git a/MapboxGLAndroidSDK/src/test/java/com/mapbox/mapboxsdk/MapboxTest.java b/MapboxGLAndroidSDK/src/test/java/com/mapbox/mapboxsdk/MapboxTest.java
index a4b57367..93d4562a 100644
--- a/MapboxGLAndroidSDK/src/test/java/com/mapbox/mapboxsdk/MapboxTest.java
+++ b/MapboxGLAndroidSDK/src/test/java/com/mapbox/mapboxsdk/MapboxTest.java
@@ -67,6 +67,11 @@ public void testSkTokenValid() {
     assertTrue(Mapbox.isAccessTokenValid("sk.0000000001"));
   }
 
+  @Test
+  public void testTkTokenValid() {
+    assertTrue(Mapbox.isAccessTokenValid("tk.0000000001"));
+  }
+
   @Test
   public void testEmptyToken() {
     assertFalse(Mapbox.isAccessTokenValid(""));