diff --git a/Sources/App/Classes/IRC/IRCClient.m b/Sources/App/Classes/IRC/IRCClient.m
index f00f66d80..135883466 100644
--- a/Sources/App/Classes/IRC/IRCClient.m
+++ b/Sources/App/Classes/IRC/IRCClient.m
@@ -224,6 +224,7 @@ @interface IRCClient ()
 @property (nonatomic, strong) TLOTimer *whoTimer;
 @property (nonatomic, assign) BOOL capabilityNegotiationIsPaused;
 @property (nonatomic, assign) BOOL invokingISONCommandForFirstTime;
+@property (nonatomic, assign) BOOL invokingBatchedISONCommand;
 @property (nonatomic, assign) BOOL isTerminating; // Is being destroyed
 @property (nonatomic, assign) BOOL inWhoisResponse;
 @property (nonatomic, assign) BOOL inWhowasResponse;
@@ -241,6 +242,7 @@ @interface IRCClient ()
 @property (nonatomic, assign) NSUInteger autojoinDelayedWarningCount;
 @property (nonatomic, copy, nullable) NSString *tryingNicknameSentNickname;
 @property (nonatomic, strong) NSMutableArray<IRCChannel *> *channelListPrivate;
+@property (nonatomic, strong) NSMutableArray<NSString *> *onlineNicknames;
 @property (nonatomic, strong, nullable) NSMutableArray<IRCChannel *> *channelsToAutojoin;
 @property (nonatomic, strong) IRCAddressBookMatchCache *addressBookMatchCache;
 @property (nonatomic, strong) IRCAddressBookUserTrackingContainer *trackedUsers;
@@ -320,6 +322,8 @@ - (void)prepareInitialState
 	
 	self.trackedUsers = [[IRCAddressBookUserTrackingContainer alloc] initWithClient:self];
 
+    self.onlineNicknames = [NSMutableArray array];
+
 	self.requestedCommands = [IRCClientRequestedCommands new];
 
 	self.lastMessageServerTime = self.config.lastMessageServerTime;
@@ -9463,6 +9467,16 @@ - (void)receiveNumericReply:(IRCMessage *)m
 
 			NSArray *onlineNicknames = [onlineNicknamesString componentsSeparatedByCharactersInSet:[NSCharacterSet whitespaceCharacterSet]];
 
+            [self.onlineNicknames addObjectsFromArray: onlineNicknames];
+
+            /* If we were invoking a batched ISON command and there's still
+             batches to process, wait until we've the last batch before
+             updating the channel list */
+            if (self.invokingBatchedISONCommand)
+                return;
+
+            onlineNicknames = self.onlineNicknames;
+
 			/* Start going over the list of tracked nicknames */
 			NSDictionary *trackedUsers = self.trackedUsers.trackedUsers;
 
@@ -12161,6 +12175,8 @@ - (void)_sendIsonForNicknames:(NSArray<NSString *> *)nicknames hideResponse:(BOO
 	if (nicknames.count == 0) {
 		return;
 	}
+    
+    [self.onlineNicknames removeAllObjects];
 
 	if (hideResponse == NO) {
 		[self.requestedCommands recordIsonRequestOpenedAsVisible];
@@ -12168,9 +12184,12 @@ - (void)_sendIsonForNicknames:(NSArray<NSString *> *)nicknames hideResponse:(BOO
 		[self.requestedCommands recordIsonRequestOpened];
 	}
 
-	NSString *nicknamesString = [nicknames componentsJoinedByString:@" "];
-
-	[self send:@"ISON", nicknamesString, nil];
+    self.invokingBatchedISONCommand = true;
+    [nicknames enumerateSubarraysOfSize:8 usingBlock:^(NSArray *objects, BOOL *stop) {
+        NSString *nicknamesString = [objects componentsJoinedByString:@" "];
+        [self send:@"ISON", nicknamesString, nil];
+    }];
+    self.invokingBatchedISONCommand = false;
 }
 
 - (void)requestChannelList