diff --git a/agrirouter-sdk-java-impl/src/main/java/com/dke/data/agrirouter/impl/onboard/secured/AuthorizationRequestServiceImpl.java b/agrirouter-sdk-java-impl/src/main/java/com/dke/data/agrirouter/impl/onboard/secured/AuthorizationRequestServiceImpl.java
index e74c413e..250572c0 100644
--- a/agrirouter-sdk-java-impl/src/main/java/com/dke/data/agrirouter/impl/onboard/secured/AuthorizationRequestServiceImpl.java
+++ b/agrirouter-sdk-java-impl/src/main/java/com/dke/data/agrirouter/impl/onboard/secured/AuthorizationRequestServiceImpl.java
@@ -85,7 +85,9 @@ public AuthorizationResponse extractAuthorizationResponseFromQuery(String query)
               }
             });
     AuthorizationResponse authorizationResponse = new AuthorizationResponse();
-    authorizationResponse.setSignature(authorizationResults.get(SIGNATURE_KEY));
+    if (authorizationResults.containsKey(SIGNATURE_KEY)) {
+        authorizationResponse.setSignature(authorizationResults.get(SIGNATURE_KEY));
+    }
     authorizationResponse.setState(authorizationResults.get(STATE_KEY));
     authorizationResponse.setToken(authorizationResults.get(TOKEN_KEY));
     authorizationResponse.setError(authorizationResults.get(ERROR_KEY));