diff --git a/src/widget/form/chatform.cpp b/src/widget/form/chatform.cpp
index bb6051e36..b7442b91c 100644
--- a/src/widget/form/chatform.cpp
+++ b/src/widget/form/chatform.cpp
@@ -901,11 +901,6 @@ QString ChatForm::secondsToDHMS(quint32 duration)
     return cD + res.sprintf("%dd%02dh %02dm %02ds", days, hours, minutes, seconds);
 }
 
-bool ChatForm::getIsTyping()
-{
-    return isTyping;
-}
-
 void ChatForm::setFriendTyping(bool isTyping)
 {
     chatWidget->setTypingNotificationVisible(isTyping);
diff --git a/src/widget/form/chatform.h b/src/widget/form/chatform.h
index 239642818..ea211fdcf 100644
--- a/src/widget/form/chatform.h
+++ b/src/widget/form/chatform.h
@@ -44,7 +44,6 @@ public:
     void loadHistory(QDateTime since, bool processUndelivered = false);
 
     void dischargeReceipt(int receipt);
-    bool getIsTyping();
     void setFriendTyping(bool isTyping);
     OfflineMsgEngine* getOfflineMsgEngine();
 
diff --git a/src/widget/widget.cpp b/src/widget/widget.cpp
index e0da17cdb..715d661b4 100644
--- a/src/widget/widget.cpp
+++ b/src/widget/widget.cpp
@@ -694,10 +694,6 @@ void Widget::onFriendStatusChanged(int friendId, Status status)
     if (isActualChange && status != Status::Offline)
     { // wait a little
         QTimer::singleShot(250, f->getChatForm()->getOfflineMsgEngine(), SLOT(deliverOfflineMsgs()));
-
-        // Send another typing notification if the contact comes back online
-        if (f->getChatForm()->getIsTyping() && Settings::getInstance().isTypingNotificationEnabled())
-            Core::getInstance()->sendTyping(f->getFriendID(), true);
     }
 }