diff --git a/http-client/src/components/account.rs b/http-client/src/components/account.rs
index 91457e3..d913797 100644
--- a/http-client/src/components/account.rs
+++ b/http-client/src/components/account.rs
@@ -36,6 +36,10 @@ impl Account {
         }
     }
 
+    fn is_transfer_account_valid(&self) -> bool {
+        self.selected_transfer_account().is_some()
+    }
+
     fn is_amount_valid(&self) -> bool {
         self.amount() > 0_f64
     }
@@ -157,7 +161,7 @@ impl Component for Account {
 
                             <button onclick={on_deposit} class={classes!("account__button")} disabled={!self.amount_valid}>{"deposit"}</button>
                             <button onclick={on_withdraw} class={classes!("account__button")} disabled={!self.amount_valid}>{"withdraw"}</button>
-                            <button onclick={on_transfer} class={classes!("account__button")} disabled={!self.amount_valid}>{"transfer"}</button>
+                            <button onclick={on_transfer} class={classes!("account__button")} disabled={!self.amount_valid || !self.is_transfer_account_valid()}>{"transfer"}</button>
                         </fieldset>
                     </section>
             </>