diff --git a/CHANGELOG.md b/CHANGELOG.md
index 2d95c43027..7fdf15fc3b 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -5,6 +5,7 @@ Changelog
 
 ### Features
 
+- Added warning message when pasting an address of the same wallet in the send form ([PR 2506](https://github.com/input-output-hk/daedalus/pull/2506))
 - Implemented select search style variables ([PR 2512](https://github.com/input-output-hk/daedalus/pull/2512))
 - Enabled pasting of wallet recovery phrase ([PR 2459](https://github.com/input-output-hk/daedalus/pull/2459))
 
diff --git a/package.json b/package.json
index 0bc9435a32..b0750ad1b5 100644
--- a/package.json
+++ b/package.json
@@ -234,7 +234,7 @@
     "react-intl": "2.7.2",
     "react-lottie": "1.2.3",
     "react-markdown": "4.3.1",
-    "react-polymorph": "0.9.8-rc.21",
+    "react-polymorph": "1.0.0-rc.1",
     "react-router": "5.2.0",
     "react-router-dom": "5.2.0",
     "react-svg-inline": "2.1.1",
diff --git a/source/renderer/app/components/wallet/WalletSendForm.js b/source/renderer/app/components/wallet/WalletSendForm.js
index 87a65d51bf..121bf02064 100755
--- a/source/renderer/app/components/wallet/WalletSendForm.js
+++ b/source/renderer/app/components/wallet/WalletSendForm.js
@@ -67,6 +67,7 @@ type Props = {
   onOpenDialogAction: Function,
   onUnsetActiveAssetFingerprint: Function,
   onExternalLinkClick: Function,
+  isAddressFromSameWallet: boolean,
 };
 
 type State = {
@@ -124,6 +125,10 @@ export default class WalletSendForm extends Component<Props, State> {
   // Read more: https://facebook.github.io/react/blog/2015/12/16/ismounted-antipattern.html
   _isMounted = false;
 
+  // We need to prevent auto focus of ada and token amount fields in case user pastes
+  // or enters a receiver address which belongs to the same wallet he is sending from.
+  _isAutoFocusEnabled = true;
+
   componentDidMount() {
     this._isMounted = true;
     this.updateFormFields(true);
@@ -299,8 +304,14 @@ export default class WalletSendForm extends Component<Props, State> {
     return receiverField.value.length > 0;
   };
 
-  hasAssetValue = (asset: Field) => {
-    return get(asset, 'value', false);
+  isAddressFromSameWallet = () => {
+    const { isAddressFromSameWallet } = this.props;
+    const receiverField = this.form.$('receiver');
+    return (
+      this.hasReceiverValue() &&
+      isAddressFromSameWallet &&
+      receiverField.isValid
+    );
   };
 
   isDisabled = () =>
@@ -327,6 +338,9 @@ export default class WalletSendForm extends Component<Props, State> {
                 ];
               }
               const isValid = await this.props.addressValidator(value);
+              if (isValid && this.isAddressFromSameWallet()) {
+                this._isAutoFocusEnabled = false;
+              }
               this.setReceiverValidity(isValid);
               const adaAmountField = form.$('adaAmount');
               const isAdaAmountValid = adaAmountField.isValid;
@@ -551,6 +565,7 @@ export default class WalletSendForm extends Component<Props, State> {
       selectedAssetFingerprints,
     });
     this.resetTransactionFee();
+    this._isAutoFocusEnabled = true;
   };
 
   removeAssetRow = (fingerprint: string) => {
@@ -628,7 +643,6 @@ export default class WalletSendForm extends Component<Props, State> {
         ];
       },
     ]);
-    this.form.$(newAsset).focus();
 
     const assetsDropdown = `assetsDropdown_${fingerprint}`;
     this.form.add({
@@ -679,8 +693,8 @@ export default class WalletSendForm extends Component<Props, State> {
     const { currencyMaxFractionalDigits, walletAmount } = this.props;
 
     const {
-      receiver: receiverField,
       adaAmount: adaAmountField,
+      receiver: receiverField,
       assetFields,
       assetsDropdown,
     } = formFields.receiver;
@@ -700,20 +714,39 @@ export default class WalletSendForm extends Component<Props, State> {
       !this.hasAvailableAssets ? styles.disabled : null,
       'primary',
     ]);
+
+    const receiverFieldClasses = classNames([
+      styles.receiverInput,
+      this.isAddressFromSameWallet() ? styles.sameRecieverInput : null,
+    ]);
+
     const minAdaRequiredTooltip = selectedAssetFingerprints.length
       ? messages.minAdaRequiredWithAssetTooltip
       : messages.minAdaRequiredWithNoAssetTooltip;
 
+    const sameWalletError = intl.formatMessage(messages.sameWalletLabel);
+    let receiverFieldError = receiverField.error;
+    let receiverFieldThemeVars = {};
+    if (this.isAddressFromSameWallet()) {
+      receiverFieldError = sameWalletError;
+      receiverFieldThemeVars = {
+        '--rp-input-border-color-errored':
+          'var(--rp-password-input-warning-score-color)',
+        '--rp-pop-over-bg-color':
+          'var(--rp-password-input-warning-score-color)',
+      };
+    }
+
     return (
       <div className={styles.fieldsContainer}>
-        <div className={styles.receiverInput}>
+        <div className={receiverFieldClasses}>
           <Input
             {...receiverField.bind()}
             ref={(field) => {
               this.addFocusableField(field);
             }}
             className="receiver"
-            error={receiverField.error}
+            error={receiverFieldError}
             onChange={(value) => {
               receiverField.onChange(value || '');
               this.setState({
@@ -721,6 +754,7 @@ export default class WalletSendForm extends Component<Props, State> {
               });
             }}
             onKeyPress={this.handleSubmitOnEnter}
+            themeVariables={receiverFieldThemeVars}
           />
           {this.hasReceiverValue() && (
             <div className={styles.clearReceiverContainer}>
@@ -731,6 +765,7 @@ export default class WalletSendForm extends Component<Props, State> {
                 <button
                   onClick={() => this.handleOnReset()}
                   className={styles.clearReceiverButton}
+                  tabIndex={-1}
                 >
                   <SVGInline
                     svg={closeIcon}
@@ -781,7 +816,7 @@ export default class WalletSendForm extends Component<Props, State> {
                   error={adaAmountField.error || transactionFeeError}
                   onKeyPress={this.handleSubmitOnEnter}
                   allowSigns={false}
-                  autoFocus
+                  autoFocus={this._isAutoFocusEnabled}
                 />
                 <div className={styles.minAdaRequired}>
                   <span>
@@ -825,6 +860,7 @@ export default class WalletSendForm extends Component<Props, State> {
                       handleSubmitOnEnter={this.handleSubmitOnEnter}
                       clearAssetFieldValue={this.clearAssetFieldValue}
                       onChangeAsset={this.onChangeAsset}
+                      autoFocus={this._isAutoFocusEnabled}
                     />
                   )
                 )}
diff --git a/source/renderer/app/components/wallet/WalletSendForm.scss b/source/renderer/app/components/wallet/WalletSendForm.scss
index e13628a372..08c7e02538 100755
--- a/source/renderer/app/components/wallet/WalletSendForm.scss
+++ b/source/renderer/app/components/wallet/WalletSendForm.scss
@@ -128,6 +128,12 @@
       }
     }
   }
+
+  &.sameRecieverInput {
+    input {
+      border-color: var(--rp-password-input-warning-score-color) !important;
+    }
+  }
 }
 
 .estimatedFeeInput,
diff --git a/source/renderer/app/components/wallet/send-form/AssetInput.js b/source/renderer/app/components/wallet/send-form/AssetInput.js
index 3e012adad6..c9865893b1 100644
--- a/source/renderer/app/components/wallet/send-form/AssetInput.js
+++ b/source/renderer/app/components/wallet/send-form/AssetInput.js
@@ -37,6 +37,7 @@ type Props = {
   handleSubmitOnEnter: Function,
   clearAssetFieldValue: Function,
   onChangeAsset: Function,
+  autoFocus: boolean,
 };
 
 const INPUT_FIELD_PADDING_DELTA = 10;
@@ -91,6 +92,7 @@ export default class AssetInput extends Component<Props> {
       handleSubmitOnEnter,
       clearAssetFieldValue,
       onChangeAsset,
+      autoFocus,
     } = this.props;
     const asset = getAssetByFingerprint(fingerprint);
     if (!asset) {
@@ -176,6 +178,7 @@ export default class AssetInput extends Component<Props> {
             handleSubmitOnEnter(evt);
           }}
           allowSigns={false}
+          autoFocus={autoFocus}
         />
         <div className={styles.rightContent} ref={this.rightContentRef}>
           {this.hasAssetValue(assetField) && (
diff --git a/source/renderer/app/components/wallet/send-form/messages.js b/source/renderer/app/components/wallet/send-form/messages.js
index 70eb0c8bbb..3986c873b3 100644
--- a/source/renderer/app/components/wallet/send-form/messages.js
+++ b/source/renderer/app/components/wallet/send-form/messages.js
@@ -44,6 +44,12 @@ export default defineMessages({
     defaultMessage: '!!!Clear',
     description: 'Label for the "Clear" button in the wallet send form.',
   },
+  sameWalletLabel: {
+    id: 'wallet.send.form.sameWalletLabel',
+    defaultMessage:
+      '!!!This receiver address belongs to the same wallet from which you are sending funds. If you proceed with this transaction, the transferred funds will remain in this wallet, and you will incur transaction fees, as outlined in Estimated fees.',
+    description: 'Label for the same wallet tooltip in the wallet send form.',
+  },
   addAssetButtonLabel: {
     id: 'wallet.send.form.button.addAssetButtonLabel',
     defaultMessage: '!!!+ Add a token',
diff --git a/source/renderer/app/containers/wallet/WalletSendPage.js b/source/renderer/app/containers/wallet/WalletSendPage.js
index 5d9483aa89..6427ce925d 100755
--- a/source/renderer/app/containers/wallet/WalletSendPage.js
+++ b/source/renderer/app/containers/wallet/WalletSendPage.js
@@ -103,7 +103,7 @@ export default class WalletSendPage extends Component<Props> {
       hardwareWallets,
       assets: assetsStore,
     } = this.props.stores;
-    const { isValidAddress } = wallets;
+    const { isValidAddress, isAddressFromSameWallet } = wallets;
     const { validateAmount } = transactions;
     const { hwDeviceStatus } = hardwareWallets;
     const hasAssetsEnabled = WALLET_ASSETS_ENABLED;
@@ -182,6 +182,7 @@ export default class WalletSendPage extends Component<Props> {
         }
         onUnsetActiveAssetFingerprint={this.handleUnsetActiveAssetFingerprint}
         onExternalLinkClick={app.openExternalLink}
+        isAddressFromSameWallet={isAddressFromSameWallet}
       />
     );
   }
diff --git a/source/renderer/app/i18n/locales/defaultMessages.json b/source/renderer/app/i18n/locales/defaultMessages.json
index 7ec7d41f6b..642040b29d 100644
--- a/source/renderer/app/i18n/locales/defaultMessages.json
+++ b/source/renderer/app/i18n/locales/defaultMessages.json
@@ -10352,18 +10352,32 @@
           "line": 42
         }
       },
+      {
+        "defaultMessage": "!!!This receiver address belongs to the same wallet from which you are sending funds. If you proceed with this transaction, the transferred funds will remain in this wallet, and you will incur transaction fees, as outlined in Estimated fees.",
+        "description": "Label for the same wallet tooltip in the wallet send form.",
+        "end": {
+          "column": 3,
+          "line": 52
+        },
+        "file": "source/renderer/app/components/wallet/send-form/messages.js",
+        "id": "wallet.send.form.sameWalletLabel",
+        "start": {
+          "column": 19,
+          "line": 47
+        }
+      },
       {
         "defaultMessage": "!!!+ Add a token",
         "description": "Label for the \"+ Add a token\" button in the wallet send form.",
         "end": {
           "column": 3,
-          "line": 52
+          "line": 58
         },
         "file": "source/renderer/app/components/wallet/send-form/messages.js",
         "id": "wallet.send.form.button.addAssetButtonLabel",
         "start": {
           "column": 23,
-          "line": 47
+          "line": 53
         }
       },
       {
@@ -10371,13 +10385,13 @@
         "description": "Label for the \"Estimated fees\" number input in the wallet send form.",
         "end": {
           "column": 3,
-          "line": 58
+          "line": 64
         },
         "file": "source/renderer/app/components/wallet/send-form/messages.js",
         "id": "wallet.send.form.estimatedFee.label",
         "start": {
           "column": 21,
-          "line": 53
+          "line": 59
         }
       },
       {
@@ -10385,13 +10399,13 @@
         "description": "Label for the \"of\" max ADA value in the wallet send form.",
         "end": {
           "column": 3,
-          "line": 63
+          "line": 69
         },
         "file": "source/renderer/app/components/wallet/send-form/messages.js",
         "id": "wallet.send.form.of.label",
         "start": {
           "column": 11,
-          "line": 59
+          "line": 65
         }
       },
       {
@@ -10399,13 +10413,13 @@
         "description": "Label for the min ADA required value in the wallet send form.",
         "end": {
           "column": 3,
-          "line": 69
+          "line": 75
         },
         "file": "source/renderer/app/components/wallet/send-form/messages.js",
         "id": "wallet.send.form.minAdaRequired",
         "start": {
           "column": 18,
-          "line": 64
+          "line": 70
         }
       },
       {
@@ -10413,13 +10427,13 @@
         "description": "Tooltip for the min ADA required value in the wallet send form.",
         "end": {
           "column": 3,
-          "line": 76
+          "line": 82
         },
         "file": "source/renderer/app/components/wallet/send-form/messages.js",
         "id": "wallet.send.form.minAdaRequiredWithAssetTooltip",
         "start": {
           "column": 34,
-          "line": 70
+          "line": 76
         }
       },
       {
@@ -10427,13 +10441,13 @@
         "description": "Tooltip for the min ADA required value in the wallet send form.",
         "end": {
           "column": 3,
-          "line": 83
+          "line": 89
         },
         "file": "source/renderer/app/components/wallet/send-form/messages.js",
         "id": "wallet.send.form.minAdaRequiredWithNoAssetTooltip",
         "start": {
           "column": 36,
-          "line": 77
+          "line": 83
         }
       },
       {
@@ -10441,13 +10455,13 @@
         "description": "Label for the \"description\" text area in the wallet send form.",
         "end": {
           "column": 3,
-          "line": 89
+          "line": 95
         },
         "file": "source/renderer/app/components/wallet/send-form/messages.js",
         "id": "wallet.send.form.description.label",
         "start": {
           "column": 20,
-          "line": 84
+          "line": 90
         }
       },
       {
@@ -10455,13 +10469,13 @@
         "description": "Hint in the \"description\" text area in the wallet send form.",
         "end": {
           "column": 3,
-          "line": 94
+          "line": 100
         },
         "file": "source/renderer/app/components/wallet/send-form/messages.js",
         "id": "wallet.send.form.description.hint",
         "start": {
           "column": 19,
-          "line": 90
+          "line": 96
         }
       },
       {
@@ -10469,13 +10483,13 @@
         "description": "Label for the reset button on the wallet send form.",
         "end": {
           "column": 3,
-          "line": 99
+          "line": 105
         },
         "file": "source/renderer/app/components/wallet/send-form/messages.js",
         "id": "wallet.send.form.reset",
         "start": {
           "column": 20,
-          "line": 95
+          "line": 101
         }
       },
       {
@@ -10483,13 +10497,13 @@
         "description": "Label for the send button on the wallet send form.",
         "end": {
           "column": 3,
-          "line": 104
+          "line": 110
         },
         "file": "source/renderer/app/components/wallet/send-form/messages.js",
         "id": "wallet.send.form.send",
         "start": {
           "column": 19,
-          "line": 100
+          "line": 106
         }
       },
       {
@@ -10497,13 +10511,13 @@
         "description": "Error message shown when invalid amount was entered.",
         "end": {
           "column": 3,
-          "line": 109
+          "line": 115
         },
         "file": "source/renderer/app/components/wallet/send-form/messages.js",
         "id": "wallet.send.form.errors.invalidAmount",
         "start": {
           "column": 17,
-          "line": 105
+          "line": 111
         }
       },
       {
@@ -10511,13 +10525,13 @@
         "description": "Error message shown when invalid transaction title was entered.",
         "end": {
           "column": 3,
-          "line": 115
+          "line": 121
         },
         "file": "source/renderer/app/components/wallet/send-form/messages.js",
         "id": "wallet.send.form.errors.invalidTitle",
         "start": {
           "column": 16,
-          "line": 110
+          "line": 116
         }
       },
       {
@@ -10525,13 +10539,13 @@
         "description": "Syncing transactions message shown during async wallet restore in the wallet send form.",
         "end": {
           "column": 3,
-          "line": 122
+          "line": 128
         },
         "file": "source/renderer/app/components/wallet/send-form/messages.js",
         "id": "wallet.send.form.syncingTransactionsMessage",
         "start": {
           "column": 30,
-          "line": 116
+          "line": 122
         }
       },
       {
@@ -10539,13 +10553,13 @@
         "description": "Label for the \"Calculating fees\" message for amount input field.",
         "end": {
           "column": 3,
-          "line": 128
+          "line": 134
         },
         "file": "source/renderer/app/components/wallet/send-form/messages.js",
         "id": "wallet.send.form.calculatingFeesLabel",
         "start": {
           "column": 24,
-          "line": 123
+          "line": 129
         }
       },
       {
@@ -10553,13 +10567,13 @@
         "description": "Syncing wallet label on the send tokens form.",
         "end": {
           "column": 3,
-          "line": 133
+          "line": 139
         },
         "file": "source/renderer/app/components/wallet/send-form/messages.js",
         "id": "wallet.send.form.syncingWallet",
         "start": {
           "column": 17,
-          "line": 129
+          "line": 135
         }
       }
     ],
diff --git a/source/renderer/app/i18n/locales/en-US.json b/source/renderer/app/i18n/locales/en-US.json
index 818a436083..5a6d8931db 100755
--- a/source/renderer/app/i18n/locales/en-US.json
+++ b/source/renderer/app/i18n/locales/en-US.json
@@ -965,6 +965,7 @@
   "wallet.send.form.receiver.label": "Receiver",
   "wallet.send.form.receiver.placeholder": "Paste an address",
   "wallet.send.form.reset": "Reset",
+  "wallet.send.form.sameWalletLabel": "This receiver address belongs to the same wallet from which you are sending funds. If you proceed with this transaction, the transferred funds will remain in this wallet, and you will incur transaction fees, as outlined in Estimated fees.",
   "wallet.send.form.send": "Send",
   "wallet.send.form.syncingTransactionsMessage": "The balance and transaction history of this wallet is being synced with the blockchain.",
   "wallet.send.form.syncingWallet": "syncing",
diff --git a/source/renderer/app/i18n/locales/ja-JP.json b/source/renderer/app/i18n/locales/ja-JP.json
index 937c895415..40b940bf67 100755
--- a/source/renderer/app/i18n/locales/ja-JP.json
+++ b/source/renderer/app/i18n/locales/ja-JP.json
@@ -965,6 +965,7 @@
   "wallet.send.form.receiver.label": "送金先",
   "wallet.send.form.receiver.placeholder": "アドレスを貼り付け",
   "wallet.send.form.reset": "リセット",
+  "wallet.send.form.sameWalletLabel": "この送金先アドレスは、送金元となるウォレットと同じウォレットのものです。このトランザクションを実行すると、送信された資金はこのウォレットにとどまりますが、見積もり手数料に示されるトランザクション手数料は発生します。",
   "wallet.send.form.send": "送信",
   "wallet.send.form.syncingTransactionsMessage": "ウォレットの残高とトランザクション履歴は現在ブロックチェーンと同期中です。",
   "wallet.send.form.syncingWallet": "同期",
diff --git a/source/renderer/app/stores/WalletsStore.js b/source/renderer/app/stores/WalletsStore.js
index a2ad31c4cb..36469b00e0 100644
--- a/source/renderer/app/stores/WalletsStore.js
+++ b/source/renderer/app/stores/WalletsStore.js
@@ -81,6 +81,8 @@ export default class WalletsStore extends Store {
 
   @observable undelegateWalletSubmissionSuccess: ?boolean = null;
 
+  @observable isAddressFromSameWallet: boolean = false;
+
   // REQUESTS
   @observable walletsRequest: Request<Array<Wallet>> = new Request(
     this.api.ada.getWallets
@@ -1117,6 +1119,8 @@ export default class WalletsStore extends Store {
     const { isMainnet, isSelfnode, isStaging, isTestnet } = this.environment;
     let expectedNetworkTag: ?Array<?number> | ?number;
     let validAddressStyles: AddressStyle[] = ['Byron', 'Icarus', 'Shelley'];
+    this.isAddressFromSameWallet = false;
+
     if (isMainnet) {
       expectedNetworkTag = MAINNET_MAGIC;
     } else if (isStaging) {
@@ -1138,6 +1142,14 @@ export default class WalletsStore extends Store {
       if (response === 'Invalid') {
         return false;
       }
+      runInAction('check if address is from the same wallet', () => {
+        const walletAddresses = this.stores.addresses.all
+          .slice()
+          .map((addr) => addr.id);
+        this.isAddressFromSameWallet = !!walletAddresses.filter(
+          (addr) => addr === address
+        ).length;
+      });
       return (
         validAddressStyles.includes(response.introspection.address_style) &&
         ((Array.isArray(expectedNetworkTag) &&
@@ -1205,6 +1217,7 @@ export default class WalletsStore extends Store {
     this.walletsRequest.reset();
     this.stores.addresses.addressesRequests = [];
     this.stores.transactions.transactionsRequests = [];
+    this.isAddressFromSameWallet = false;
   };
 
   @action _importWalletFromFile = async (
@@ -1286,6 +1299,7 @@ export default class WalletsStore extends Store {
       matchRoute(ROUTES.WALLETS.SEND, buildRoute(options.route, options.params))
     ) {
       this.sendMoneyRequest.reset();
+      this.isAddressFromSameWallet = false;
     }
   };
 
diff --git a/source/renderer/app/themes/overrides/OptionsOverrides.scss b/source/renderer/app/themes/overrides/OptionsOverrides.scss
index 3f8946417a..8c30eb709c 100644
--- a/source/renderer/app/themes/overrides/OptionsOverrides.scss
+++ b/source/renderer/app/themes/overrides/OptionsOverrides.scss
@@ -20,6 +20,10 @@
     }
   }
 
+  &:not(.hasSearch) .option em {
+    background-color: initial !important;
+  }
+
   [data-bubble-arrow] {
     display: none !important;
   }
diff --git a/storybook/stories/wallets/send/WalletSend.stories.js b/storybook/stories/wallets/send/WalletSend.stories.js
index d0e58fd57b..ea0a87e186 100644
--- a/storybook/stories/wallets/send/WalletSend.stories.js
+++ b/storybook/stories/wallets/send/WalletSend.stories.js
@@ -218,6 +218,7 @@ storiesOf('Wallets|Send', module)
       hasAssets={boolean('hasAssets', false)}
       selectedAsset={null}
       onUnsetActiveAssetFingerprint={() => {}}
+      isAddressFromSameWallet={boolean('isAddressFromSameWallet', false)}
     />
   ))
   .add('Send - Hardware wallet verifying transaction', () => (
@@ -241,6 +242,7 @@ storiesOf('Wallets|Send', module)
       hasAssets={boolean('hasAssets', false)}
       selectedAsset={null}
       onUnsetActiveAssetFingerprint={() => {}}
+      isAddressFromSameWallet={boolean('isAddressFromSameWallet', false)}
     />
   ))
   .add('Send - Hardware wallet verifying transaction succeeded', () => (
@@ -264,6 +266,7 @@ storiesOf('Wallets|Send', module)
       hasAssets={boolean('hasAssets', false)}
       selectedAsset={null}
       onUnsetActiveAssetFingerprint={() => {}}
+      isAddressFromSameWallet={boolean('isAddressFromSameWallet', false)}
     />
   ))
   .add('Send - Hardware wallet verifying transaction failed', () => (
@@ -287,6 +290,7 @@ storiesOf('Wallets|Send', module)
       hasAssets={boolean('hasAssets', false)}
       selectedAsset={null}
       onUnsetActiveAssetFingerprint={() => {}}
+      isAddressFromSameWallet={boolean('isAddressFromSameWallet', false)}
     />
   ))
   .add('Send - With Assets', () => (
@@ -313,6 +317,7 @@ storiesOf('Wallets|Send', module)
       hasAssets={boolean('hasAssets', true)}
       selectedAsset={null}
       onUnsetActiveAssetFingerprint={() => {}}
+      isAddressFromSameWallet={boolean('isAddressFromSameWallet', false)}
     />
   ))
   .add('Wallet Send Confirmation Dialog With Assets', () => (
diff --git a/yarn.lock b/yarn.lock
index f2176fce48..648efb46e5 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -12735,9 +12735,9 @@ react-modal@3.1.12:
     prop-types "^15.5.10"
     warning "^3.0.0"
 
-react-polymorph@0.9.8-rc.21:
-  version "0.9.8-rc.21"
-  resolved "https://registry.yarnpkg.com/react-polymorph/-/react-polymorph-0.9.8-rc.21.tgz#aeec762dd5e8db0dfb47d114c04522134f4ccaa2"
+react-polymorph@1.0.0-rc.1:
+  version "1.0.0-rc.1"
+  resolved "https://registry.yarnpkg.com/react-polymorph/-/react-polymorph-1.0.0-rc.1.tgz#666c18bbd2683dc61b617ff2e32a0302f974fa98"
   dependencies:
     "@tippyjs/react" "4.2.1"
     create-react-context "0.2.2"