diff --git a/components/mobile-plugins/windows-plugin/org.wso2.carbon.device.mgt.mobile.windows/src/main/java/org/wso2/carbon/device/mgt/mobile/windows/impl/WindowsTokenServiceImpl.java b/components/mobile-plugins/windows-plugin/org.wso2.carbon.device.mgt.mobile.windows/src/main/java/org/wso2/carbon/device/mgt/mobile/windows/impl/WindowsTokenServiceImpl.java
index eddbb4b1a7..945dfa1ad0 100644
--- a/components/mobile-plugins/windows-plugin/org.wso2.carbon.device.mgt.mobile.windows/src/main/java/org/wso2/carbon/device/mgt/mobile/windows/impl/WindowsTokenServiceImpl.java
+++ b/components/mobile-plugins/windows-plugin/org.wso2.carbon.device.mgt.mobile.windows/src/main/java/org/wso2/carbon/device/mgt/mobile/windows/impl/WindowsTokenServiceImpl.java
@@ -16,7 +16,6 @@ public class WindowsTokenServiceImpl implements WindowsTokenService {
 
     public WindowsTokenServiceImpl() {
         windowsEnrollmentTokenDAO = new WindowsEnrollmentTokenDAOImpl();
-        WindowsDAOFactory windowsDAOFactory = new WindowsDAOFactory();
     }
 
     @Override
diff --git a/components/mobile-plugins/windows-plugin/org.wso2.carbon.device.mgt.mobile.windows/src/main/java/org/wso2/carbon/device/mgt/mobile/windows/impl/dao/WindowsDAOFactory.java b/components/mobile-plugins/windows-plugin/org.wso2.carbon.device.mgt.mobile.windows/src/main/java/org/wso2/carbon/device/mgt/mobile/windows/impl/dao/WindowsDAOFactory.java
index 760a8a5fd8..a49110e22e 100644
--- a/components/mobile-plugins/windows-plugin/org.wso2.carbon.device.mgt.mobile.windows/src/main/java/org/wso2/carbon/device/mgt/mobile/windows/impl/dao/WindowsDAOFactory.java
+++ b/components/mobile-plugins/windows-plugin/org.wso2.carbon.device.mgt.mobile.windows/src/main/java/org/wso2/carbon/device/mgt/mobile/windows/impl/dao/WindowsDAOFactory.java
@@ -77,6 +77,15 @@ public class WindowsDAOFactory extends AbstractMobileDeviceManagementDAOFactory
         if (currentConnection.get() == null) {
             Connection conn;
             try {
+                if (dataSource == null) {
+                    try {
+                        String dataSourceName = "jdbc/MobileWindowsDM_DS";
+                        Context ctx = new InitialContext();
+                        dataSource = (DataSource) ctx.lookup(dataSourceName);
+                    } catch (NamingException e) {
+                        throw new MobileDeviceManagementDAOException("Error occurred while initializing datasource", e);
+                    }
+                }
                 conn = dataSource.getConnection();
                 currentConnection.set(conn);
             } catch (SQLException e) {