diff --git a/src/routes/Settings/SectionsList/SectionsList.js b/src/routes/Settings/SectionsList/SectionsList.js
index 509c0a498..d56de298a 100644
--- a/src/routes/Settings/SectionsList/SectionsList.js
+++ b/src/routes/Settings/SectionsList/SectionsList.js
@@ -180,7 +180,7 @@ const SectionsList = React.forwardRef(({ className, sections, preferences, onPre
                                     <div key={'server_available'} className={classnames(styles['input-container'], styles['text-container'])}>
                                         <div className={styles['text']}>
                                             <Icon className={classnames(styles['icon'], { [styles['x-icon']]: preferences.streaming_error })} icon={preferences.streaming_error ? 'ic_x' : 'ic_check'} />
-                                            <div className={styles['label']}>{'Streaming server is ' + (preferences.streaming_error ? 'not ' : '') + 'available. Reason: ' + preferences.streaming_error}</div>
+                                            <div className={styles['label']}>{'Streaming server is ' + (preferences.streaming_error ? 'not ' : '') + 'available.'}{preferences.streaming_error && ' Reason: ' + preferences.streaming_error}</div>
                                         </div>
                                     </div>
                                 </React.Fragment>
diff --git a/src/routes/Settings/useSettings.js b/src/routes/Settings/useSettings.js
index 9af135cd4..4f71eba0e 100644
--- a/src/routes/Settings/useSettings.js
+++ b/src/routes/Settings/useSettings.js
@@ -1,29 +1,35 @@
 const React = require('react');
 const { useServices } = require('stremio/services');
 
-module.exports = () => {
-    const IGNORED_SETTINGS = Object.freeze(['user', 'streaming']);
+const IGNORED_SETTINGS = Object.freeze(['user', 'streaming']);
 
+module.exports = () => {
     const { core } = useServices();
-    const [settings, setSettings] = React.useState({ streaming: {} });
+
+    const [settings, setSettings] = React.useState({
+        user: null,
+        streaming: {},
+        streaming_loaded: false,
+        streaming_error: ""
+    });
 
     React.useEffect(() => {
         const onNewState = () => {
-            const state = core.getState()
+            const { ctx, streaming_server_settings } = core.getState()
             try {
                 const newSettings = {
                     ...settings,
-                    ...state.ctx.content.settings,
-                    user: state.ctx.content.auth ? state.ctx.content.auth.user : null,
-                    streaming: state.streaming_server_settings && state.streaming_server_settings.ready || {},
-                    streaming_loaded: state.streaming_server_settings && (state.streaming_server_settings.error || state.streaming_server_settings.ready),
-                    streaming_error: state.streaming_server_settings && state.streaming_server_settings.error || "",
+                    ...ctx.content.settings,
+                    user: ctx.content.auth ? ctx.content.auth.user : null,
+                    streaming: streaming_server_settings && streaming_server_settings.ready || {},
+                    streaming_loaded: streaming_server_settings && !!(streaming_server_settings.error || streaming_server_settings.ready),
+                    streaming_error: streaming_server_settings && streaming_server_settings.error || "",
                 };
                 setSettings(newSettings);
             } catch (e) {
                 console.log('Cannot update settings state', e);
             }
-        }
+        };
         const onStoreError = ({ event, args }) => {
             if (event !== "SettingsStoreError") return;
             // TODO: Notify with maybe a toast?