diff --git a/js/data/JsonDeviceFolderReader.js b/js/data/JsonDeviceFolderReader.js
index 04ece92..ce6ae03 100644
--- a/js/data/JsonDeviceFolderReader.js
+++ b/js/data/JsonDeviceFolderReader.js
@@ -9,20 +9,13 @@ Ext.namespace('Zarafa.plugins.mdm.data');
  * {@link Zarafa.plugins.mdm.data.MDMDeviceRecord records}.
  */
 Zarafa.plugins.mdm.data.JsonDeviceFolderReader = Ext.extend(Zarafa.core.data.JsonReader, {
-
-	/**
-	 * @cfg {Zarafa.core.data.RecordCustomObjectType} customObjectType The custom object type
-	 * which represents the {@link Ext.data.Record records} which should be created using
-	 * {@link Zarafa.core.data.RecordFactory#createRecordObjectByCustomType}.
-	 */
-	customObjectType: Zarafa.core.data.RecordCustomObjectType.MDM_Device_Folder,
-
+	
 	/**
 	 * @constructor
 	 * @param {Object} meta Metadata configuration options.
 	 * @param {Object} recordType (optional) Optional Record type matches the type
 	 * which must be read from response. If no type is given, it will use the
-	 * record type for the {@link Zarafa.core.data.RecordCustomObjectType#ZARAFA_RECIPIENT}.
+	 * record type for the {@link Zarafa.core.data.RecordCustomObjectType#MDM_Device_Folder}.
 	 */
 	constructor: function (meta, recordType)
 	{
@@ -33,7 +26,7 @@ Zarafa.plugins.mdm.data.JsonDeviceFolderReader = Ext.extend(Zarafa.core.data.Jso
 		});
 
 		if (!Ext.isDefined(recordType)) {
-			recordType = Zarafa.core.data.RecordFactory.getRecordClassByCustomType(meta.customObjectType || this.customObjectType);
+			recordType = Zarafa.core.data.RecordFactory.getRecordClassByCustomType(meta.customObjectType);
 		}
 
 		Zarafa.plugins.mdm.data.JsonDeviceFolderReader.superclass.constructor.call(this, meta, recordType);
diff --git a/js/data/MDMDeviceFolderStore.js b/js/data/MDMDeviceFolderStore.js
index 1f89c4c..3b3ce4e 100644
--- a/js/data/MDMDeviceFolderStore.js
+++ b/js/data/MDMDeviceFolderStore.js
@@ -7,6 +7,14 @@ Ext.namespace('Zarafa.plugins.mdm.data');
  * Store specific for MDM Plugin which creates {@link Zarafa.plugins.mdm.MDMDeviceFolderStore record}.
  */
 Zarafa.plugins.mdm.data.MDMDeviceFolderStore = Ext.extend(Zarafa.core.data.MAPISubStore, {
+
+	/**
+	 * @cfg {Zarafa.core.data.RecordCustomObjectType} customObjectType The custom object type
+	 * which represents the {@link Ext.data.Record records} which should be created using
+	 * {@link Zarafa.core.data.RecordFactory#createRecordObjectByCustomType}.
+	 */
+	customObjectType: Zarafa.core.data.RecordCustomObjectType.MDM_Device_Folder,
+
 	/**
 	 * @constructor
 	 * @param config Configuration object
@@ -18,7 +26,9 @@ Zarafa.plugins.mdm.data.MDMDeviceFolderStore = Ext.extend(Zarafa.core.data.MAPIS
 		Ext.applyIf(config, {
 			autoLoad: true,
 			remoteSort: false,
-			reader: new Zarafa.plugins.mdm.data.JsonDeviceFolderReader(),
+			reader: new Zarafa.plugins.mdm.data.JsonDeviceFolderReader({
+				customObjectType: this.customObjectType
+			}),
 			writer: new Zarafa.plugins.mdm.data.MDMDeviceFolderWriter(),
 			proxy: new Zarafa.core.data.IPMProxy({
 				listModuleName: 'pluginmdmmodule',