diff --git a/js/bootstrap-datepicker.js b/js/bootstrap-datepicker.js
index d04ea915f..a56134c5d 100644
--- a/js/bootstrap-datepicker.js
+++ b/js/bootstrap-datepicker.js
@@ -792,8 +792,9 @@
 			}, this));
 			dates = $.grep(dates, $.proxy(function(date){
 				return (
-					!this.dateWithinRange(date) ||
-					!date
+          !this.dateWithinRange(date) ||
+          !date ||
+          this.dateIsDisabled(date)
 				);
 			}, this), true);
 			this.dates.replace(dates);