diff --git a/web/react/components/textbox.jsx b/web/react/components/textbox.jsx
index c8c0c071ee..d4eb606761 100644
--- a/web/react/components/textbox.jsx
+++ b/web/react/components/textbox.jsx
@@ -61,7 +61,7 @@ export default class Textbox extends React.Component {
     onRecievedError() {
         const errorCount = ErrorStore.getConnectionErrorCount();
 
-        if (errorCount > 0) {
+        if (errorCount > 1) {
             this.setState({connection: 'bad-connection'});
         } else {
             this.setState({connection: ''});
diff --git a/web/react/stores/socket_store.jsx b/web/react/stores/socket_store.jsx
index 9b2b049b74..ec25255d98 100644
--- a/web/react/stores/socket_store.jsx
+++ b/web/react/stores/socket_store.jsx
@@ -31,6 +31,7 @@ class SocketStoreClass extends EventEmitter {
         this.close = this.close.bind(this);
 
         this.failCount = 0;
+        this.isInitialize = false;
 
         this.translations = this.getDefaultTranslations();
 
@@ -58,24 +59,23 @@ class SocketStoreClass extends EventEmitter {
 
             if (this.failCount === 0) {
                 console.log('websocket connecting to ' + connUrl); //eslint-disable-line no-console
-                if (ErrorStore.getConnectionErrorCount() > 0) {
-                    ErrorStore.setConnectionErrorCount(0);
-                    ErrorStore.emitChange();
-                }
             }
+
             conn = new WebSocket(connUrl);
 
             conn.onopen = () => {
                 if (this.failCount > 0) {
                     console.log('websocket re-established connection'); //eslint-disable-line no-console
-
-                    ErrorStore.clearLastError();
-                    ErrorStore.emitChange();
-
                     AsyncClient.getChannels();
                     AsyncClient.getPosts(ChannelStore.getCurrentId());
                 }
 
+                if (this.isInitialize) {
+                    ErrorStore.clearLastError();
+                    ErrorStore.emitChange();
+                }
+
+                this.isInitialize = true;
                 this.failCount = 0;
             };