1 files changed, 1 insertions, 1 deletions
diff --git a/Swiften/Queries/IQRouter.cpp b/Swiften/Queries/IQRouter.cpp
index 65f9d7f..c84e1bb 100644
--- a/Swiften/Queries/IQRouter.cpp
+++ b/Swiften/Queries/IQRouter.cpp
@@ -75,19 +75,19 @@ void IQRouter::removeHandler(boost::shared_ptr<IQHandler> handler) {
 	if (queueRemoves_) {
 		queuedRemoves_.push_back(handler);
 	}
 	else {
 		erase(handlers_, handler);
 	}
 }
 
 void IQRouter::sendIQ(boost::shared_ptr<IQ> iq) {
-	if (from_.isValid()) {
+	if (from_.isValid() && !iq->getFrom().isValid()) {
 		iq->setFrom(from_);
 	}
 	channel_->sendIQ(iq);
 }
 
 std::string IQRouter::getNewIQID() {
 	return channel_->getNewIQID();
 }