diff --git a/components/device-mgt/org.wso2.carbon.device.mgt.core/src/main/java/org/wso2/carbon/device/mgt/core/DeviceManagerImpl.java b/components/device-mgt/org.wso2.carbon.device.mgt.core/src/main/java/org/wso2/carbon/device/mgt/core/DeviceManagerImpl.java
index 0b7b402d22f..726c43c3430 100644
--- a/components/device-mgt/org.wso2.carbon.device.mgt.core/src/main/java/org/wso2/carbon/device/mgt/core/DeviceManagerImpl.java
+++ b/components/device-mgt/org.wso2.carbon.device.mgt.core/src/main/java/org/wso2/carbon/device/mgt/core/DeviceManagerImpl.java
@@ -135,8 +135,6 @@ public class DeviceManagerImpl implements DeviceManager {
 					convertedDevice.setProperties(dmsDevice.getProperties());
 					convertedDevice.setFeatures(dmsDevice.getFeatures());
 				}
-			} else {
-				throw new DeviceManagementException("No device found for the id '" + deviceId.getId() + "'");
 			}
 		} catch (DeviceManagementDAOException e) {
 			throw new DeviceManagementException(