diff --git a/components/org.wso2.carbon.identity.oauth.endpoint/src/main/java/org/wso2/carbon/identity/oauth/endpoint/device/DeviceEndpoint.java b/components/org.wso2.carbon.identity.oauth.endpoint/src/main/java/org/wso2/carbon/identity/oauth/endpoint/device/DeviceEndpoint.java
index 266da80b21..e3d0d8b419 100644
--- a/components/org.wso2.carbon.identity.oauth.endpoint/src/main/java/org/wso2/carbon/identity/oauth/endpoint/device/DeviceEndpoint.java
+++ b/components/org.wso2.carbon.identity.oauth.endpoint/src/main/java/org/wso2/carbon/identity/oauth/endpoint/device/DeviceEndpoint.java
@@ -32,6 +32,7 @@
 import org.wso2.carbon.identity.oauth.common.OAuth2ErrorCodes;
 import org.wso2.carbon.identity.oauth.common.OAuthConstants;
 import org.wso2.carbon.identity.oauth.config.OAuthServerConfiguration;
+import org.wso2.carbon.identity.oauth.endpoint.OAuthRequestWrapper;
 import org.wso2.carbon.identity.oauth.endpoint.exception.TokenEndpointBadRequestException;
 import org.wso2.carbon.identity.oauth.endpoint.util.EndpointUtil;
 import org.wso2.carbon.identity.oauth2.IdentityOAuth2Exception;
@@ -81,6 +82,9 @@ public Response authorize(@Context HttpServletRequest request, MultivaluedMap<St
             return handleErrorResponse(oAuthClientAuthnContext);
         }
 
+        // Wrap the request to avoid missing of request attributes.
+        request = new OAuthRequestWrapper(request, paramMap);
+
         try {
             validateRepeatedParams(request, paramMap);
             String deviceCode = UUID.randomUUID().toString();
diff --git a/components/org.wso2.carbon.identity.oauth.endpoint/src/test/java/org/wso2/carbon/identity/oauth/endpoint/device/DeviceEndpointTest.java b/components/org.wso2.carbon.identity.oauth.endpoint/src/test/java/org/wso2/carbon/identity/oauth/endpoint/device/DeviceEndpointTest.java
index 045402bee8..ff8abb073e 100644
--- a/components/org.wso2.carbon.identity.oauth.endpoint/src/test/java/org/wso2/carbon/identity/oauth/endpoint/device/DeviceEndpointTest.java
+++ b/components/org.wso2.carbon.identity.oauth.endpoint/src/test/java/org/wso2/carbon/identity/oauth/endpoint/device/DeviceEndpointTest.java
@@ -54,6 +54,7 @@
 import java.lang.reflect.Method;
 import java.nio.file.Paths;
 import java.util.ArrayList;
+import java.util.Enumeration;
 import java.util.List;
 
 import javax.servlet.http.HttpServletRequest;
@@ -225,6 +226,19 @@ public void testDevice(String clientId, int expectedStatus, boolean status)
                     DeviceFlowPersistenceFactory::getInstance).thenReturn(this.deviceFlowPersistenceFactory);
             lenient().when(this.deviceFlowPersistenceFactory.getDeviceFlowDAO()).thenReturn(deviceFlowDAO);
             lenient().when(deviceFlowDAO.checkClientIdExist(anyString())).thenReturn(status);
+
+            lenient().when(httpServletRequest.getParameterNames()).thenReturn(new Enumeration<String>() {
+                @Override
+                public boolean hasMoreElements() {
+                    return false;  // Return false to simulate no parameter names
+                }
+
+                @Override
+                public String nextElement() {
+                    return null;  // Return null as there's no next element
+                }
+            });
+
             response = deviceEndpoint.authorize(httpServletRequest, new MultivaluedHashMap<>(),
                     httpServletResponse);
             Assert.assertEquals(expectedStatus, response.getStatus());