diff --git a/include/Swiften/Server/ServerStanzaChannel.cpp b/include/Swiften/Server/ServerStanzaChannel.cpp
index 690cc515b1ff624606f2b2eed98a059dbd7008a9..a04ab595fba60fbf539a2240c71861f92bcaaa8d 100644
--- a/include/Swiften/Server/ServerStanzaChannel.cpp
+++ b/include/Swiften/Server/ServerStanzaChannel.cpp
@@ -116,9 +116,7 @@ void ServerStanzaChannel::handleElement(boost::shared_ptr<Element> element, cons
 		return;
 	}
 
-	if (stanza->getFrom().toString().empty()) {
-		stanza->setFrom(session->getRemoteJID());
-	}
+	stanza->setFrom(session->getRemoteJID());
 
 	if (!stanza->getFrom().isValid())
 		return;