diff --git a/src/plugins/irc-events/away.js b/src/plugins/irc-events/away.js
index 1a3dabce..b5779f2f 100644
--- a/src/plugins/irc-events/away.js
+++ b/src/plugins/irc-events/away.js
@@ -34,6 +34,14 @@ module.exports = function(irc, network) {
 					return;
 				}
 
+				if (chan.userAway === away) {
+					return;
+				}
+
+				// Store current away message on channel model,
+				// because query windows have no users
+				chan.userAway = away;
+
 				user = chan.getUser(data.nick);
 
 				break;
@@ -45,6 +53,8 @@ module.exports = function(irc, network) {
 					return;
 				}
 
+				user.away = away;
+
 				break;
 
 			default:
@@ -59,7 +69,6 @@ module.exports = function(irc, network) {
 			});
 
 			chan.pushMessage(client, msg);
-			user.away = away;
 		});
 	}
 };