diff --git a/spring-data-mongodb/src/main/java/org/springframework/data/document/mongodb/repository/ConvertingParameterAccessor.java b/spring-data-mongodb/src/main/java/org/springframework/data/document/mongodb/repository/ConvertingParameterAccessor.java
index b884d38d1..308d91abd 100644
--- a/spring-data-mongodb/src/main/java/org/springframework/data/document/mongodb/repository/ConvertingParameterAccessor.java
+++ b/spring-data-mongodb/src/main/java/org/springframework/data/document/mongodb/repository/ConvertingParameterAccessor.java
@@ -71,6 +71,27 @@ public class ConvertingParameterAccessor implements ParameterAccessor {
 	public Sort getSort() {
 		return delegate.getSort();
 	}
+	
+	/* (non-Javadoc)
+	 * @see org.springframework.data.repository.query.ParameterAccessor#getBindableParameter(int)
+	 */
+	public Object getBindableValue(int index) {
+		
+		return getConvertedValue(delegate.getBindableValue(index));
+	}
+	
+	/**
+	 * Converts the given value with the underlying {@link MongoWriter}.
+	 * 
+	 * @param value
+	 * @return
+	 */
+	private Object getConvertedValue(Object value) {
+		
+		DBObject result = new BasicDBObject();
+		writer.write(value.getClass().isEnum() ? new EnumValueHolder((Enum<?>) value) : new ValueHolder(value), result);
+		return result.get("value");
+	}
 
 	/**
 	 * Custom {@link Iterator} to convert items before returning them.
@@ -106,9 +127,7 @@ public class ConvertingParameterAccessor implements ParameterAccessor {
 		 */
 		public Object next() {
 
-			DBObject result = new BasicDBObject();
-			writer.write(new ValueHolder(delegate.next()), result);
-			return result.get("value");
+			return getConvertedValue(delegate.next());
 		}
 
 		/*
@@ -141,4 +160,20 @@ public class ConvertingParameterAccessor implements ParameterAccessor {
 			return value;
 		}
 	}
+	
+	private static class EnumValueHolder {
+		
+		private Enum<?> value;
+		
+		public EnumValueHolder(Enum<?> value) {
+			this.value = value;
+		}
+		
+		/**
+		 * @return the value
+		 */
+		public Enum<?> getValue() {
+			return value;
+		}
+	}
 }