diff --git a/src/main/java/org/springframework/data/gemfire/config/DiskWriteAttributesFactoryBean.java b/src/main/java/org/springframework/data/gemfire/config/DiskWriteAttributesFactoryBean.java
index a13c4a1c..016d38ff 100644
--- a/src/main/java/org/springframework/data/gemfire/config/DiskWriteAttributesFactoryBean.java
+++ b/src/main/java/org/springframework/data/gemfire/config/DiskWriteAttributesFactoryBean.java
@@ -41,14 +41,14 @@ class DiskWriteAttributesFactoryBean implements FactoryBean<DiskWriteAttributes>
 	}
 
 	public Class<?> getObjectType() {
-		return DiskWriteAttributes.class;
+		return (attributes != null ? attributes.getClass() : DiskWriteAttributes.class);
 	}
 
 	public boolean isSingleton() {
 		return true;
 	}
-	
-	public void setDiskAttributesFactory(DiskWriteAttributesFactory dwaf){
+
+	public void setDiskAttributesFactory(DiskWriteAttributesFactory dwaf) {
 		this.attrFactory = dwaf;
 	}
 }