diff --git a/js/bootstrap-datepicker.js b/js/bootstrap-datepicker.js
index 9dfcdb0a0..d336dbaa7 100644
--- a/js/bootstrap-datepicker.js
+++ b/js/bootstrap-datepicker.js
@@ -1663,7 +1663,7 @@
 					opts = $.extend({}, defaults, locopts, elopts, options);
 				if ($this.hasClass('input-daterange') || opts.inputs){
 					$.extend(opts, {
-						inputs: opts.inputs || $this.find('input').toArray()
+						inputs: opts.inputs || $this.find('.date').toArray().length !== 0 ? $this.find('.date').toArray() : $this.find('input').toArray()
 					});
 					data = new DateRangePicker(this, opts);
 				}