Merge branch 'stable'

2 files changed, 9 insertions, 3 deletions

diff --git a/src/Classes/EnhancedApi.js b/src/Classes/EnhancedApi.js
index 7f345e2..bb6a428 100644
--- a/src/Classes/EnhancedApi.js
+++ b/src/Classes/EnhancedApi.js
@@ -535,12 +535,12 @@ export default class EnhancedApi extends SimpleApi {
      *
      * @param setting
      * @param value
-     * @returns {*}
+     * @returns {Promise<*>}
      */
-    setSetting(setting, value) {
+    async setSetting(setting, value) {
         let settings = {};
         settings[setting] = value;
-        let data = super.setSettings(settings);
+        let data = await super.setSettings(settings);
         return data[setting];
     }
 
diff --git a/src/Classes/SimpleApi.js b/src/Classes/SimpleApi.js
index 4472535..a5b78e5 100644
--- a/src/Classes/SimpleApi.js
+++ b/src/Classes/SimpleApi.js
@@ -831,6 +831,12 @@ export default class SimpleApi {
         let sessionToken = response.headers.get('X-API-SESSION');
 
         if(sessionToken && sessionToken !== this._config.sessionToken) {
+            if(response.url.indexOf('service/favicon') !== -1 ||
+               response.url.indexOf('service/preview') !== -1 ||
+               response.url.indexOf('service/avatar') !== -1) {
+                return;
+            }
+
             let oldSessionToken = this._config.sessionToken;
             this._config.sessionToken = sessionToken;
             this._headers['X-API-SESSION'] = sessionToken;