diff --git a/packages/react-components/src/InputAddress/createHeader.tsx b/packages/react-components/src/InputAddress/createHeader.tsx
index 8816442ea9..fcf449b295 100644
--- a/packages/react-components/src/InputAddress/createHeader.tsx
+++ b/packages/react-components/src/InputAddress/createHeader.tsx
@@ -10,6 +10,9 @@ import Dropdown from '../Dropdown';
 
 export default function createHeader (option: KeyringSectionOption): React.ReactNode {
   return (
-    <Dropdown.Header content={option.name} />
+    <Dropdown.Header
+      key={option.key || option.name}
+      content={option.name}
+    />
   );
 }
diff --git a/packages/react-components/src/InputAddress/index.tsx b/packages/react-components/src/InputAddress/index.tsx
index a241c79978..acf8ef68af 100644
--- a/packages/react-components/src/InputAddress/index.tsx
+++ b/packages/react-components/src/InputAddress/index.tsx
@@ -222,7 +222,7 @@ class InputAddress extends React.PureComponent<Props, State> {
 
     return !optionsAll
       ? []
-      : optionsAll[type].filter(({ value }): boolean => !!value && (!filter || filter.includes(value)));
+      : optionsAll[type].filter(({ value }): boolean => !filter || (!!value && filter.includes(value)));
   }
 
   private onChange = (address: string): void => {
@@ -250,17 +250,13 @@ class InputAddress extends React.PureComponent<Props, State> {
     const query = _query.trim();
     const queryLower = query.toLowerCase();
     const matches = filteredOptions.filter((item): boolean =>
-      item.value !== null && (
+      !!item.value && (
         (item.name.toLowerCase && item.name.toLowerCase().includes(queryLower)) ||
         item.value.toLowerCase().includes(queryLower)
       )
     );
 
-    const valueMatches = matches.filter((item): boolean =>
-      item.value !== null
-    );
-
-    if (isInput && valueMatches.length === 0) {
+    if (isInput && matches.length === 0) {
       const accountId = transformToAccountId(query);
 
       if (accountId) {