diff --git a/src/Multiselect.jsx b/src/Multiselect.jsx
index bc0c35387..20f00c531 100644
--- a/src/Multiselect.jsx
+++ b/src/Multiselect.jsx
@@ -281,7 +281,7 @@ var Multiselect = React.createClass({
                 onSelect={this._onSelect}
                 onMove={this._scrollTo}
                 messages={{
-                  emptyList: data.length
+                  emptyList: this._lengthWithoutValues
                     ? messages.emptyFilter
                     : messages.emptyList
                 }}