diff --git a/plugin/src/ApiContext.lua b/plugin/src/ApiContext.lua
index c16535d0..a3e321cd 100644
--- a/plugin/src/ApiContext.lua
+++ b/plugin/src/ApiContext.lua
@@ -19,17 +19,14 @@ setmetatable(ApiContext.Error, {
 	end
 })
 
--- TODO: Switch to onMessages and batch processing
 function ApiContext.new(baseUrl)
 	assert(type(baseUrl) == "string")
 
 	local self = {
 		baseUrl = baseUrl,
-		onMessageCallback = nil,
 		serverId = nil,
 		rootInstanceId = nil,
 		instanceMetadataMap = nil,
-		connected = false,
 		messageCursor = -1,
 		partitionRoutes = nil,
 	}
@@ -100,21 +97,14 @@ function ApiContext:connect()
 			self.partitionRoutes = body.partitions
 			self.rootInstanceId = body.rootInstanceId
 			self.instanceMetadataMap = body.instanceMetadataMap
-			self.connected = true
 		end)
 end
 
 function ApiContext:read(ids)
-	if not self.connected then
-		return Promise.reject()
-	end
-
 	local url = ("%s/api/read/%s"):format(self.baseUrl, table.concat(ids, ","))
 
 	return Http.get(url)
 		:catch(function(err)
-			self.connected = false
-
 			return Promise.reject(err)
 		end)
 		:andThen(function(response)
@@ -131,10 +121,6 @@ function ApiContext:read(ids)
 end
 
 function ApiContext:retrieveMessages()
-	if not self.connected then
-		return Promise.reject()
-	end
-
 	local url = ("%s/api/subscribe/%s"):format(self.baseUrl, self.messageCursor)
 
 	return Http.get(url)
@@ -143,8 +129,6 @@ function ApiContext:retrieveMessages()
 				return self:retrieveMessages()
 			end
 
-			self.connected = false
-
 			return Promise.reject(err)
 		end)
 		:andThen(function(response)
@@ -154,20 +138,9 @@ function ApiContext:retrieveMessages()
 				return Promise.reject("Server changed ID")
 			end
 
-			local promise = Promise.resolve(nil)
-
-			for _, message in ipairs(body.messages) do
-				promise = promise:andThen(function()
-					return self.onMessageCallback(message)
-				end)
-			end
-
 			self.messageCursor = body.messageCursor
 
-			return promise
-		end)
-		:andThen(function()
-			return self:retrieveMessages()
+			return body.messages
 		end)
 end
 
diff --git a/plugin/src/Components/App.lua b/plugin/src/Components/App.lua
index 35bed493..2b99c764 100644
--- a/plugin/src/Components/App.lua
+++ b/plugin/src/Components/App.lua
@@ -95,8 +95,9 @@ function App:render()
 					local success, session = Session.new({
 						address = address,
 						port = port,
-						onError = function()
-							Logging.trace("Session terminated")
+						onError = function(message)
+							Logging.warn("%s", tostring(message))
+							Logging.trace("Session terminated due to error")
 							self.currentSession = nil
 
 							self:setState({
@@ -145,12 +146,13 @@ function App:didMount()
 		if self.state.sessionStatus == SessionStatus.Connected then
 			Logging.trace("Disconnecting session")
 
+			self.currentSession:disconnect()
 			self.currentSession = nil
 			self:setState({
 				sessionStatus = SessionStatus.Disconnected,
 			})
 
-			error("TODO: Actually disconnect old session")
+			Logging.trace("Session terminated by user")
 		elseif self.state.sessionStatus == SessionStatus.Disconnected then
 			Logging.trace("Starting session configuration")
 
diff --git a/plugin/src/Session.lua b/plugin/src/Session.lua
index 5e1d15df..77d1c75b 100644
--- a/plugin/src/Session.lua
+++ b/plugin/src/Session.lua
@@ -1,66 +1,99 @@
+local Rojo = script:FindFirstAncestor("Rojo")
+
+local Promise = require(Rojo.Promise)
+
 local ApiContext = require(script.Parent.ApiContext)
-local Logging = require(script.Parent.Logging)
 local Reconciler = require(script.Parent.Reconciler)
 
 local Session = {}
 Session.__index = Session
 
 function Session.new(config)
-	local self = {}
-
-	self.onError = config.onError
-
-	local hasErrors = false
-
-	local reconciler
-
 	local remoteUrl = ("http://%s:%s"):format(config.address, config.port)
-
 	local api = ApiContext.new(remoteUrl)
 
-	ApiContext:onMessage(function(message)
-		local requestedIds = {}
-
-		for _, id in ipairs(message.added) do
-			table.insert(requestedIds, id)
-		end
-
-		for _, id in ipairs(message.updated) do
-			table.insert(requestedIds, id)
-		end
-
-		for _, id in ipairs(message.removed) do
-			table.insert(requestedIds, id)
-		end
-
-		return api:read(requestedIds)
-			:andThen(function(response)
-				return reconciler:applyUpdate(requestedIds, response.instances)
-			end)
-			:catch(function(message)
-				hasErrors = true
-				Logging.warn("%s", tostring(message))
-				self.onError()
-			end)
-	end)
+	local self = {
+		onError = config.onError,
+		disconnected = false,
+		reconciler = nil,
+		api = api,
+	}
 
 	api:connect()
 		:andThen(function()
-			reconciler = Reconciler.new(api.instanceMetadataMap)
+			if self.disconnected then
+				return Promise.resolve()
+			end
+
+			self.reconciler = Reconciler.new(api.instanceMetadataMap)
 
 			return api:read({api.rootInstanceId})
-		end)
-		:andThen(function(response)
-			reconciler:reconcile(response.instances, api.rootInstanceId, game)
-			return api:retrieveMessages()
+				:andThen(function(response)
+					if self.disconnected then
+						return Promise.resolve()
+					end
+
+					self.reconciler:reconcile(response.instances, api.rootInstanceId, game)
+					return self:__processMessages()
+				end)
 		end)
 		:catch(function(message)
-			hasErrors = true
-			Logging.warn("%s", tostring(message))
-			self.onError()
+			self.disconnected = true
+			self.onError(message)
 		end)
 
-	return not hasErrors, setmetatable(self, Session)
+	return not self.disconnected, setmetatable(self, Session)
+end
+
+function Session:__processMessages()
+	if self.disconnected then
+		return Promise.resolve()
+	end
+
+	return self.api:retrieveMessages()
+		:andThen(function(messages)
+			local promise = Promise.resolve(nil)
+
+			for _, message in ipairs(messages) do
+				promise = promise:andThen(function()
+					return self:__onMessage(message)
+				end)
+			end
+
+			return promise
+		end)
+		:andThen(function()
+			return self:__processMessages()
+		end)
+end
+
+function Session:__onMessage(message)
+	if self.disconnected then
+		return Promise.resolve()
+	end
+
+	local requestedIds = {}
+
+	for _, id in ipairs(message.added) do
+		table.insert(requestedIds, id)
+	end
+
+	for _, id in ipairs(message.updated) do
+		table.insert(requestedIds, id)
+	end
+
+	for _, id in ipairs(message.removed) do
+		table.insert(requestedIds, id)
+	end
+
+	return self.api:read(requestedIds)
+		:andThen(function(response)
+			return self.reconciler:applyUpdate(requestedIds, response.instances)
+		end)
+end
+
+function Session:disconnect()
+	self.disconnected = true
 end
 
 return Session
\ No newline at end of file