diff --git a/src/services/signalingService.js b/src/services/signalingService.js
index 93c4f69d228..6bf2ac3024c 100644
--- a/src/services/signalingService.js
+++ b/src/services/signalingService.js
@@ -33,8 +33,8 @@ const fetchSignalingSettings = async(token) => {
 	return axios.get(generateOcsUrl('apps/spreed/api/v1/signaling', 2) + 'settings')
 }
 
-const pullSignalingMessages = async(token) => {
-	return axios.get(generateOcsUrl('apps/spreed/api/v1/signaling', 2) + token)
+const pullSignalingMessages = async(token, options) => {
+	return axios.get(generateOcsUrl('apps/spreed/api/v1/signaling', 2) + token, options)
 }
 
 const getWelcomeMessage = async(serverId) => {
diff --git a/src/utils/signaling.js b/src/utils/signaling.js
index b3534063171..869355e3abc 100644
--- a/src/utils/signaling.js
+++ b/src/utils/signaling.js
@@ -448,12 +448,12 @@ Signaling.Internal.prototype._startPullingMessages = function() {
 			})
 			this._startPullingMessages()
 		}.bind(this))
-		.catch(function(jqXHR, textStatus/*, errorThrown */) {
-			if (jqXHR.status === 0 && textStatus === 'abort') {
-				// Request has been aborted. Ignore.
-			} else if (token !== this.currentRoomToken) {
+		.catch(function(error) {
+			if (token !== this.currentRoomToken) {
 				// User navigated away in the meantime. Ignore
-			} else if (jqXHR.status === 404 || jqXHR.status === 403) {
+			} else if (axios.isCancel(error)) {
+				console.debug('Pulling messages request was cancelled')
+			} else if (error.response.status === 404 || error.response.status === 403) {
 				console.error('Stop pulling messages because room does not exist or is not accessible')
 				this._trigger('pullMessagesStoppedOnFail')
 			} else if (token) {