diff --git a/frontend/src/actions/messages.js b/frontend/src/actions/messages.js
index f06bdf5..09b41a6 100644
--- a/frontend/src/actions/messages.js
+++ b/frontend/src/actions/messages.js
@@ -1,4 +1,4 @@
-import {getMessages, saveMessage} from "../fluence/api";
+import {changeConnection, getMessages, saveMessage} from "../fluence/api";
 import { showLoading, hideLoading } from "react-redux-loading-bar";
 
 export const ADD_MESSAGE = "ADD_MESSAGE";
@@ -11,18 +11,15 @@ function addMessage(message) {
     };
 }
 
-export function fetchPosts(counter, withBar) {
+export async function toggleConnection(devnet, appId = 412) {
+    return changeConnection(devnet, appId)
+}
+
+export function fetchPosts(counter) {
     return dispatch => {
-        if (withBar) {
-            dispatch(showLoading());
-        }
         return getMessages().then((messages) => {
             dispatch(receiveMessages(messages, counter));
-        }).finally(() => {
-            if (withBar) {
-                dispatch(hideLoading());
-            }
-        });
+        })
     };
 }
 
diff --git a/frontend/src/components/ConnectionToggle.js b/frontend/src/components/ConnectionToggle.js
index e84d0c9..f0fd896 100644
--- a/frontend/src/components/ConnectionToggle.js
+++ b/frontend/src/components/ConnectionToggle.js
@@ -1,6 +1,6 @@
 import React, {Component} from "react";
 import {connect} from "react-redux";
-import {toggleConnection} from "../fluence/api";
+import {toggleConnection} from "../actions/messages";
 
 class ConnectionToggle extends Component {
     constructor(props) {
@@ -20,7 +20,7 @@ class ConnectionToggle extends Component {
             toggleDisabled: true,
             devnetConnect: newConnect
         }));
-        toggleConnection(newConnect).finally(() => {
+        toggleConnection(newConnect).then(() => {
             this.setState(state => ({
                 toggleDisabled: false
             }));
diff --git a/frontend/src/components/Dashboard.js b/frontend/src/components/Dashboard.js
index f8612f1..7862940 100644
--- a/frontend/src/components/Dashboard.js
+++ b/frontend/src/components/Dashboard.js
@@ -12,11 +12,11 @@ class Dashboard extends Component {
     }
 
     componentDidMount() {
+        this.props.dispatch(handleInitialData());
         this.pollingMessages = setInterval(
             () => this.getMessages(),
-            2000
+            1500
         );
-        this.props.dispatch(handleInitialData());
     }
 
     componentWillUnmount() {
diff --git a/frontend/src/fluence/api.js b/frontend/src/fluence/api.js
index 5719d4c..03e34e1 100644
--- a/frontend/src/fluence/api.js
+++ b/frontend/src/fluence/api.js
@@ -3,7 +3,7 @@ import * as fluence from "fluence";
 let session = fluence.directConnect("localhost", 30000, 1);
 window.fluenceSession = session;
 
-export async function toggleConnection(devnet, appId = 412) {
+export async function changeConnection(devnet, appId = 412) {
     if (devnet) {
         fluence.connect("0xeFF91455de6D4CF57C141bD8bF819E5f873c1A01", appId).then((s) => {
             session = s;