diff --git a/components/dash-core-components/src/fragments/Dropdown.react.js b/components/dash-core-components/src/fragments/Dropdown.react.js
index 6fb4fe137f..a7963ac109 100644
--- a/components/dash-core-components/src/fragments/Dropdown.react.js
+++ b/components/dash-core-components/src/fragments/Dropdown.react.js
@@ -1,4 +1,4 @@
-import {isNil, pluck, without, pick, head} from 'ramda';
+import {isNil, pluck, without, pick} from 'ramda';
 import React, {useState, useCallback, useEffect, useMemo} from 'react';
 import ReactDropdown from 'react-virtualized-select';
 import createFilterOptions from 'react-select-fast-filter-options';
@@ -47,26 +47,23 @@ const Dropdown = props => {
     } = props;
     const [optionsCheck, setOptionsCheck] = useState(null);
     const [sanitizedOptions, filterOptions] = useMemo(() => {
-        let sanitized = sanitizeOptions(options);
-        const firstOption = sanitized ? head(sanitized) : null;
-        let labelKey = 'label';
-        if (firstOption && firstOption.search) {
-            labelKey = 'search';
-        } else if (firstOption && React.isValidElement(firstOption.label)) {
-            // Auto put the value as search
-            labelKey = 'search';
-            sanitized = sanitized.map(option => ({
+        const sanitized = sanitizeOptions(options).map(option => {
+            let search = option.search || option.label;
+            if (React.isValidElement(search)) {
+                search = String(option.value);
+            }
+            return {
                 ...option,
-                search: `${option.value}`,
-            }));
-        }
+                search,
+            };
+        });
 
         return [
             sanitized,
             createFilterOptions({
                 options: sanitized,
                 tokenizer: TOKENIZER,
-                labelKey,
+                labelKey: 'search',
             }),
         ];
     }, [options]);