diff --git a/packages/widget/src/components/address-input/address-input.ts b/packages/widget/src/components/address-input/address-input.ts
index b8f0ce2e..da5c005e 100644
--- a/packages/widget/src/components/address-input/address-input.ts
+++ b/packages/widget/src/components/address-input/address-input.ts
@@ -63,7 +63,7 @@ export class AddressInput extends BaseComponent {
           <span>Send to </span>
           ${when(
             this.errorMessage,
-            () => html` <span class="errorMessage">${this.errorMessage}</span>`
+            () => html`<span class="errorMessage">${this.errorMessage}</span>`
           )}</label
         >
         <textarea
diff --git a/packages/widget/src/controllers/transfers/fungible-token-transfer.ts b/packages/widget/src/controllers/transfers/fungible-token-transfer.ts
index 481f21ec..1f19466b 100644
--- a/packages/widget/src/controllers/transfers/fungible-token-transfer.ts
+++ b/packages/widget/src/controllers/transfers/fungible-token-transfer.ts
@@ -170,7 +170,7 @@ export class FungibleTokenTransferController implements ReactiveController {
   onDestinationAddressChange = (address: string): void => {
     this.destinationAddress = address;
 
-    if (this.destinationAddress.length === 0) {
+    if (this.destinationAddress && this.destinationAddress.length === 0) {
       this.pendingEvmApprovalTransactions = [];
       this.pendingEvmTransferTransaction = undefined;
       this.destinationAddress = null;
diff --git a/packages/widget/tests/unit/components/address-input/address-input.test.ts b/packages/widget/tests/unit/components/address-input/address-input.test.ts
index 20e6de70..61eef08d 100644
--- a/packages/widget/tests/unit/components/address-input/address-input.test.ts
+++ b/packages/widget/tests/unit/components/address-input/address-input.test.ts
@@ -9,8 +9,6 @@ import { html } from 'lit';
 import { Network } from '@buildwithsygma/sygma-sdk-core';
 import { AddressInput } from '../../../../src/components';
 
-const errorMessageInvalidAddress = 'invalid Ethereum address';
-
 describe('address-input component', function () {
   afterEach(() => {
     fixtureCleanup();
@@ -112,13 +110,9 @@ describe('address-input component', function () {
     await listener;
 
     assert.equal(mockAddressChangeHandler.mock.calls.length, 3);
-    assert.deepEqual(mockAddressChangeHandler.mock.calls[0], [
-      '0x123',
-      errorMessageInvalidAddress
-    ]);
+    assert.deepEqual(mockAddressChangeHandler.mock.calls[0], ['0x123']);
     assert.deepEqual(mockAddressChangeHandler.mock.lastCall, [
-      '0xebFC7A970CAAbC18C8e8b7367147C18FC7585492',
-      null
+      '0xebFC7A970CAAbC18C8e8b7367147C18FC7585492'
     ]);
   });
 
@@ -143,8 +137,8 @@ describe('address-input component', function () {
     await listener;
 
     assert.equal(mockAddressChangeHandler.mock.calls.length, 3);
-    assert.deepEqual(mockAddressChangeHandler.mock.calls[0], ['', null]);
-    assert.deepEqual(mockAddressChangeHandler.mock.calls[1], ['', null]);
+    assert.deepEqual(mockAddressChangeHandler.mock.calls[0], ['']);
+    assert.deepEqual(mockAddressChangeHandler.mock.calls[1], ['']);
 
     const errorMessage = el.shadowRoot!.querySelector(
       '.errorMessage'
@@ -160,10 +154,9 @@ describe('address-input component', function () {
 
     assert.equal(mockAddressChangeHandler.mock.calls.length, 4);
     assert.deepEqual(mockAddressChangeHandler.mock.calls[2], [
-      '0xebFC7A970CAAbC18C8e8b7367147C18FC7',
-      errorMessageInvalidAddress
+      '0xebFC7A970CAAbC18C8e8b7367147C18FC7'
     ]);
-    assert.deepEqual(mockAddressChangeHandler.mock.lastCall, ['', null]);
+    assert.deepEqual(mockAddressChangeHandler.mock.lastCall, ['']);
 
     const errorMessageAfterClean = el.shadowRoot!.querySelector(
       '.errorMessage'
@@ -195,10 +188,9 @@ describe('address-input component', function () {
     await listener;
 
     assert.equal(mockAddressChangeHandler.mock.calls.length, 3);
-    assert.deepEqual(mockAddressChangeHandler.mock.calls[0], ['', null]);
+    assert.deepEqual(mockAddressChangeHandler.mock.calls[0], ['']);
     assert.deepEqual(mockAddressChangeHandler.mock.lastCall, [
-      '42sydUvocBuEorweEPqxY5vZae1VaTtWoJFiKMrPbRamy2BL',
-      null
+      '42sydUvocBuEorweEPqxY5vZae1VaTtWoJFiKMrPbRamy2BL'
     ]);
   });
 
@@ -224,10 +216,9 @@ describe('address-input component', function () {
     await listener;
 
     assert.equal(mockAddressChangeHandler.mock.calls.length, 3);
-    assert.deepEqual(mockAddressChangeHandler.mock.calls[0], ['', null]);
+    assert.deepEqual(mockAddressChangeHandler.mock.calls[0], ['']);
     assert.deepEqual(mockAddressChangeHandler.mock.lastCall, [
-      '0xebFC7A970CAAbC18C8e8b7367147C18FC7585492',
-      null
+      '0xebFC7A970CAAbC18C8e8b7367147C18FC7585492'
     ]);
   });
 
@@ -254,8 +245,8 @@ describe('address-input component', function () {
     await listener;
 
     assert.equal(mockAddressChangeHandler.mock.calls.length, 3);
-    assert.deepEqual(mockAddressChangeHandler.mock.calls[0], ['', null]);
-    assert.deepEqual(mockAddressChangeHandler.mock.calls[1], ['', null]);
+    assert.deepEqual(mockAddressChangeHandler.mock.calls[0], ['']);
+    assert.deepEqual(mockAddressChangeHandler.mock.calls[1], ['']);
 
     const errorMessage = el.shadowRoot!.querySelector(
       '.errorMessage'
@@ -286,8 +277,8 @@ describe('address-input component', function () {
     await listener;
 
     assert.equal(mockAddressChangeHandler.mock.calls.length, 3);
-    assert.deepEqual(mockAddressChangeHandler.mock.calls[0], ['', null]);
-    assert.deepEqual(mockAddressChangeHandler.mock.calls[1], ['', null]);
+    assert.deepEqual(mockAddressChangeHandler.mock.calls[0], ['']);
+    assert.deepEqual(mockAddressChangeHandler.mock.calls[1], ['']);
 
     const errorMessage = el.shadowRoot!.querySelector(
       '.errorMessage'
@@ -317,8 +308,8 @@ describe('address-input component', function () {
     await listener;
 
     assert.equal(mockAddressChangeHandler.mock.calls.length, 3);
-    assert.deepEqual(mockAddressChangeHandler.mock.calls[0], ['', null]);
-    assert.deepEqual(mockAddressChangeHandler.mock.calls[1], ['', null]);
+    assert.deepEqual(mockAddressChangeHandler.mock.calls[0], ['']);
+    assert.deepEqual(mockAddressChangeHandler.mock.calls[1], ['']);
 
     el.networkType = Network.SUBSTRATE;
 
diff --git a/packages/widget/tests/unit/components/transfer/fungible/fungible-token-transfer.test.ts b/packages/widget/tests/unit/components/transfer/fungible/fungible-token-transfer.test.ts
index a4f68b0d..00e5547a 100644
--- a/packages/widget/tests/unit/components/transfer/fungible/fungible-token-transfer.test.ts
+++ b/packages/widget/tests/unit/components/transfer/fungible/fungible-token-transfer.test.ts
@@ -97,6 +97,6 @@ describe('Fungible token Transfer', function () {
       'sygma-address-input'
     ) as AddressInput;
 
-    assert(sygmaAddressInput.address === '');
+    assert.equal(sygmaAddressInput.address, '');
   });
 });