diff --git a/components/apimgt-extensions/org.wso2.carbon.apimgt.handlers/src/main/java/org/wso2/carbon/apimgt/handlers/AuthenticationHandler.java b/components/apimgt-extensions/org.wso2.carbon.apimgt.handlers/src/main/java/org/wso2/carbon/apimgt/handlers/AuthenticationHandler.java
index b851ee4f8c..6c95b40dee 100644
--- a/components/apimgt-extensions/org.wso2.carbon.apimgt.handlers/src/main/java/org/wso2/carbon/apimgt/handlers/AuthenticationHandler.java
+++ b/components/apimgt-extensions/org.wso2.carbon.apimgt.handlers/src/main/java/org/wso2/carbon/apimgt/handlers/AuthenticationHandler.java
@@ -209,7 +209,7 @@ public class AuthenticationHandler extends AbstractHandler {
     private String getDeviceType(String url) {
         StringTokenizer parts = new StringTokenizer(url, "/");
         while (parts.hasMoreElements()) {
-            if (parts.nextElement().equals("api")) {
+            if (parts.nextElement().equals("device-mgt")) {
                 return (String) parts.nextElement();
             }
         }