diff --git a/modules/distribution/src/core/samples/sampledevice/component/ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.sampledevice.analytics-view/analytics-view.js b/modules/distribution/src/core/samples/sampledevice/component/ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.sampledevice.analytics-view/analytics-view.js
index d9573aaa..bc55d723 100644
--- a/modules/distribution/src/core/samples/sampledevice/component/ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.sampledevice.analytics-view/analytics-view.js
+++ b/modules/distribution/src/core/samples/sampledevice/component/ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.sampledevice.analytics-view/analytics-view.js
@@ -21,7 +21,7 @@ function onRequest(context) {
 
 	var devices = context.unit.params.devices;
 	var deviceType = context.uriParams.deviceType;
-	var deviceId = request.getParameter("deviceId");
+	var deviceId = request.getParameter("deviceId").trim();
 
 	if (devices) {
 		return {
@@ -41,4 +41,4 @@ function onRequest(context) {
 			exit();
 		}
 	}
-}
\ No newline at end of file
+}