diff --git a/sdk/src/main/java/com/processout/processout_sdk/CustomerActionHandler.java b/sdk/src/main/java/com/processout/processout_sdk/CustomerActionHandler.java
index 79c7a4d7..ed4f6fb2 100644
--- a/sdk/src/main/java/com/processout/processout_sdk/CustomerActionHandler.java
+++ b/sdk/src/main/java/com/processout/processout_sdk/CustomerActionHandler.java
@@ -2,6 +2,7 @@
 
 import android.app.Activity;
 import android.content.Context;
+import android.net.Uri;
 import android.os.Handler;
 import android.util.Base64;
 import android.view.ViewGroup;
@@ -114,11 +115,14 @@ public void run() {
                 FingerprintWebView.setWebViewClient(new WebViewClient() {
                     @Override
                     public boolean shouldOverrideUrlLoading(WebView view, WebResourceRequest request) {
-                        // Check if the current Android version is supporte
+                        // Check if the current Android version is supported
                         String token = null;
 
                         if (android.os.Build.VERSION.SDK_INT >= android.os.Build.VERSION_CODES.LOLLIPOP) {
-                            token = request.getUrl().getQueryParameter("token");
+                            Uri uri = request.getUrl();
+                            if (uri.isHierarchical()) {
+                                token = uri.getQueryParameter("token");
+                            }
                         }
                         if (token == null) {
                             // Android version not supported for fingerprinting