It's always better to return the phone. That way your safe. Even though there are chances that nothing might happen to the phone your having but still its a risk. Not all the note 7 are defective. But there is not way that you can make sure which ones are safe. Better not to take it my friend...