diff --git a/src/definitions/modules/dropdown.js b/src/definitions/modules/dropdown.js
index fd3f7edaa..1ad073157 100644
--- a/src/definitions/modules/dropdown.js
+++ b/src/definitions/modules/dropdown.js
@@ -603,7 +603,7 @@ $.fn.dropdown = function(parameters) {
               }
             }
           ;
-          if(module.has.maxSelections()) {
+          if(settings.useLabels && module.has.maxSelections()) {
             return;
           }
           if(settings.apiSettings) {
@@ -1684,8 +1684,8 @@ $.fn.dropdown = function(parameters) {
                 module.debug('Maximum selection count reached');
                 if(settings.useLabels) {
                   $item.addClass(className.filtered);
+                  module.add.message(message.maxSelections);
                 }
-                module.add.message(message.maxSelections);
                 return true;
               }
               else {
@@ -2311,7 +2311,7 @@ $.fn.dropdown = function(parameters) {
               hasUserSuggestion = $addition.length > 0,
               html
             ;
-            if(module.has.maxSelections()) {
+            if(settings.useLabels && module.has.maxSelections()) {
               return;
             }
             if(value === '' || alreadyHasValue) {