diff --git a/src/client.js b/src/client.js
index 3f28b97e..064c5e50 100644
--- a/src/client.js
+++ b/src/client.js
@@ -650,7 +650,7 @@ Client.prototype.quit = function (signOut) {
 	}
 
 	this.networks.forEach((network) => {
-		network.quit(Helper.config.leaveMessage);
+		network.quit();
 		network.destroy();
 	});
 
diff --git a/src/models/network.js b/src/models/network.js
index 97dea399..bc2dbce1 100644
--- a/src/models/network.js
+++ b/src/models/network.js
@@ -439,7 +439,7 @@ Network.prototype.quit = function (quitMessage) {
 	// https://ircv3.net/specs/extensions/sts#rescheduling-expiry-on-disconnect
 	STSPolicies.refreshExpiration(this.host);
 
-	this.irc.quit(quitMessage || Helper.config.leaveMessage);
+	this.irc.quit(quitMessage || this.leaveMessage || Helper.config.leaveMessage);
 };
 
 Network.prototype.exportForEdit = function () {