diff --git a/app/components/ReadyBox.js b/app/components/ReadyBox.js
index 3b02f11..b99bff2 100644
--- a/app/components/ReadyBox.js
+++ b/app/components/ReadyBox.js
@@ -1,182 +1,191 @@
 import React, { Component, Fragment } from 'react';
 import PropTypes from 'prop-types';
 import classNames from 'classnames';
 // import VizSensor     = require('react-visibility-sensor').default;
 import autoBind from 'auto-bind';
 import { View } from 'react-native';
 import { IconButton, Title } from 'react-native-paper';
 
 import ConferenceModal from './ConferenceModal';
 import HistoryCard from './HistoryCard';
 import HistoryTileBox from './HistoryTileBox';
 import FooterBox from './FooterBox';
 import URIInput from './URIInput';
 import config from '../config';
 import utils from '../utils';
 
 import styles from '../assets/styles/blink/_ReadyBox.scss';
 
 class ReadyBox extends Component {
     constructor(props) {
         super(props);
         autoBind(this);
 
         this.state = {
             targetUri: this.props.missedTargetUri,
             showConferenceModal: false,
             sticky: false,
         };
     }
 
     getTargetUri() {
         const defaultDomain = this.props.account.id.substring(this.props.account.id.indexOf('@') + 1);
         return utils.normalizeUri(this.state.targetUri, defaultDomain);
     }
 
     handleTargetChange(value) {
-        this.setState({targetUri: value});
+        if (this.state.targetUri) {
+            let currentUri = this.getTargetUri();
+            if (currentUri.trim() === value.trim()) {
+                this.setState({targetUri: ''});
+            } else {
+                this.setState({targetUri: value});
+            }
+        } else {
+            this.setState({targetUri: value});
+        }
     }
 
     handleTargetSelect() {
         if (this.props.connection === null) {
             this.props._notificationCenter.postSystemNotification("Server unreachable", {timeout: 2});
             return;
         }
         // the user pressed enter, start a video call by default
         if (this.state.targetUri.endsWith(`@${config.defaultConferenceDomain}`)) {
             this.props.startConference(this.state.targetUri, {conference: true});
         } else {
             this.props.startCall(this.getTargetUri(), {audio: true, video: true});
         }
     }
 
     handleAudioCall(event) {
         if (this.props.connection === null) {
             this.props._notificationCenter.postSystemNotification("Server unreachable", {timeout: 2});
             return;
         }
         event.preventDefault();
         if (this.state.targetUri.endsWith(`@${config.defaultConferenceDomain}`)) {
             this.props.startConference(this.state.targetUri, {conference: true});
         } else {
             this.props.startCall(this.getTargetUri(), {audio: true, video: false});
         }
     }
 
     handleVideoCall(event) {
         if (this.props.connection === null) {
             this.props._notificationCenter.postSystemNotification("Server unreachable", {timeout: 2});
             return;
         }
         event.preventDefault();
         if (this.state.targetUri.endsWith(`@${config.defaultConferenceDomain}`)) {
             this.props.startConference(this.state.targetUri, {conference: true});
         } else {
             this.props.startCall(this.getTargetUri(), {audio: true, video: true});
         }
     }
 
     showConferenceModal(event) {
         event.preventDefault();
         if (this.state.targetUri.length !== 0) {
             const uri = `${this.state.targetUri.split('@')[0].replace(/[\s()-]/g, '')}@${config.defaultConferenceDomain}`;
             this.handleConferenceCall(uri.toLowerCase());
         } else {
             this.setState({showConferenceModal: true});
         }
     }
 
     handleConferenceCall(targetUri) {
         if (this.props.connection === null) {
             this.props._notificationCenter.postSystemNotification("Server unreachable", {timeout: 2});
             return;
         }
         this.setState({showConferenceModal: false});
         if (targetUri) {
             this.props.startConference(targetUri, {conference: true});
         }
     }
 
     render() {
         // Join URIs from local and server history for input
         let history = this.props.history.concat(
             this.props.serverHistory.map(e => e.remoteParty)
         );
         history = [...new Set(history)];
         //console.log('history from server is', this.props.serverHistory);
         return (
             <Fragment>
                 <View style={styles.wholeContainer}>
                     <View style={styles.container}>
                         <Title style={styles.title}>Enter address or phone number</Title>
                         <View style={styles.uriInputBox}>
                             <URIInput
                                 defaultValue={this.state.targetUri}
                                 data={history}
                                 onChange={this.handleTargetChange}
                                 onSelect={this.handleTargetSelect}
                                 placeholder="Eg. alice@sip2sip.info or +1800975707"
                                 autoFocus={false}
                             />
                         </View>
                         <View style={styles.buttonGroup}>
                             <IconButton
                                 style={styles.button}
                                 size={34}
                                 disabled={this.state.targetUri.length === 0}
                                 onPress={this.handleAudioCall}
                                 icon="phone"
                             />
                             <IconButton
                                 style={styles.button}
                                 size={34}
                                 disabled={this.state.targetUri.length === 0}
                                 onPress={this.handleVideoCall}
                                 icon="video"
                             />
                             <IconButton
                                 style={styles.conferenceButton}
                                 size={34}
                                 onPress={this.showConferenceModal}
                                 icon="account-group"
                             />
                         </View>
                     </View>
                     <View style={styles.history}>
                         <HistoryTileBox>
                             {this.props.serverHistory.filter(historyItem => historyItem.remoteParty.startsWith(this.state.targetUri)).map((historyItem, idx) =>
                                 (<HistoryCard
                                     key={idx}
                                     historyItem    = {historyItem}
                                     setTargetUri   = {this.handleTargetChange}
                                     startVideoCall = {this.handleVideoCall}
                                     startAudioCall = {this.handleAudioCall}
                                 />)
                             )}
                         </HistoryTileBox>
                     </View>
                     <View style={styles.footer}>
                         <FooterBox />
                     </View>
                 </View>
                 <ConferenceModal
                     show={this.state.showConferenceModal}
                     targetUri={this.state.targetUri}
                     handleConferenceCall={this.handleConferenceCall}
                 />
             </Fragment>
         );
     }
 }
 
 ReadyBox.propTypes = {
     account         : PropTypes.object.isRequired,
     startCall       : PropTypes.func.isRequired,
     startConference : PropTypes.func.isRequired,
     missedTargetUri : PropTypes.string,
     history         : PropTypes.array,
     serverHistory   : PropTypes.array
 };
 
 
 export default ReadyBox;