diff --git a/src/short-urls/reducers/shortUrlCreation.js b/src/short-urls/reducers/shortUrlCreation.js
index 0640f2c7..0b56938a 100644
--- a/src/short-urls/reducers/shortUrlCreation.js
+++ b/src/short-urls/reducers/shortUrlCreation.js
@@ -31,7 +31,6 @@ export default handleActions({
 
 export const createShortUrl = (buildShlinkApiClient) => (data) => async (dispatch, getState) => {
   dispatch({ type: CREATE_SHORT_URL_START });
-
   const { createShortUrl } = await buildShlinkApiClient(getState);
 
   try {
diff --git a/src/short-urls/reducers/shortUrlDeletion.js b/src/short-urls/reducers/shortUrlDeletion.js
index 62c78569..cc10dc64 100644
--- a/src/short-urls/reducers/shortUrlDeletion.js
+++ b/src/short-urls/reducers/shortUrlDeletion.js
@@ -32,7 +32,6 @@ export default handleActions({
 
 export const deleteShortUrl = (buildShlinkApiClient) => (shortCode, domain) => async (dispatch, getState) => {
   dispatch({ type: DELETE_SHORT_URL_START });
-
   const { deleteShortUrl } = await buildShlinkApiClient(getState);
 
   try {
diff --git a/src/short-urls/reducers/shortUrlsList.js b/src/short-urls/reducers/shortUrlsList.js
index 02efcfd7..48bd3d78 100644
--- a/src/short-urls/reducers/shortUrlsList.js
+++ b/src/short-urls/reducers/shortUrlsList.js
@@ -58,7 +58,6 @@ export default handleActions({
 
 export const listShortUrls = (buildShlinkApiClient) => (params = {}) => async (dispatch, getState) => {
   dispatch({ type: LIST_SHORT_URLS_START });
-
   const { listShortUrls } = await buildShlinkApiClient(getState);
 
   try {
diff --git a/src/tags/reducers/tagDelete.js b/src/tags/reducers/tagDelete.js
index 0420da6d..b682b98f 100644
--- a/src/tags/reducers/tagDelete.js
+++ b/src/tags/reducers/tagDelete.js
@@ -26,7 +26,6 @@ export default handleActions({
 
 export const deleteTag = (buildShlinkApiClient) => (tag) => async (dispatch, getState) => {
   dispatch({ type: DELETE_TAG_START });
-
   const { deleteTags } = await buildShlinkApiClient(getState);
 
   try {
diff --git a/src/tags/reducers/tagEdit.js b/src/tags/reducers/tagEdit.js
index 560397a8..c49da4e9 100644
--- a/src/tags/reducers/tagEdit.js
+++ b/src/tags/reducers/tagEdit.js
@@ -31,7 +31,6 @@ export const editTag = (buildShlinkApiClient, colorGenerator) => (oldName, newNa
   getState
 ) => {
   dispatch({ type: EDIT_TAG_START });
-
   const { editTag } = await buildShlinkApiClient(getState);
 
   try {
diff --git a/src/utils/services/ShlinkApiClientBuilder.js b/src/utils/services/ShlinkApiClientBuilder.js
index be170789..a7bf3e50 100644
--- a/src/utils/services/ShlinkApiClientBuilder.js
+++ b/src/utils/services/ShlinkApiClientBuilder.js
@@ -1,21 +1,16 @@
-import { wait } from '../utils';
 import ShlinkApiClient from './ShlinkApiClient';
 
 const apiClients = {};
 
-const getSelectedServerFromState = async (getState) => {
+const getSelectedServerFromState = (getState) => {
   const { selectedServer } = getState();
 
-  if (!selectedServer) {
-    return wait(250).then(() => getSelectedServerFromState(getState));
-  }
-
   return selectedServer;
 };
 
 const buildShlinkApiClient = (axios) => async (getStateOrSelectedServer) => {
   const { url, apiKey } = typeof getStateOrSelectedServer === 'function'
-    ? await getSelectedServerFromState(getStateOrSelectedServer)
+    ? getSelectedServerFromState(getStateOrSelectedServer)
     : getStateOrSelectedServer;
   const clientKey = `${url}_${apiKey}`;
 
diff --git a/src/utils/utils.js b/src/utils/utils.js
index 97595ddc..48af3f55 100644
--- a/src/utils/utils.js
+++ b/src/utils/utils.js
@@ -53,8 +53,6 @@ export const useToggle = (initialValue = false) => {
   return [ flag, () => setFlag(!flag) ];
 };
 
-export const wait = (milliseconds) => new Promise((resolve) => setTimeout(resolve, milliseconds));
-
 export const compareVersions = (firstVersion, operator, secondVersion) => compare(
   firstVersion,
   secondVersion,
diff --git a/src/visits/reducers/shortUrlDetail.js b/src/visits/reducers/shortUrlDetail.js
index 2f22243c..1a81a736 100644
--- a/src/visits/reducers/shortUrlDetail.js
+++ b/src/visits/reducers/shortUrlDetail.js
@@ -28,7 +28,6 @@ export default handleActions({
 
 export const getShortUrlDetail = (buildShlinkApiClient) => (shortCode, domain) => async (dispatch, getState) => {
   dispatch({ type: GET_SHORT_URL_DETAIL_START });
-
   const { getShortUrl } = await buildShlinkApiClient(getState);
 
   try {
diff --git a/src/visits/reducers/shortUrlVisits.js b/src/visits/reducers/shortUrlVisits.js
index 8b23125f..53e16c89 100644
--- a/src/visits/reducers/shortUrlVisits.js
+++ b/src/visits/reducers/shortUrlVisits.js
@@ -51,7 +51,6 @@ export default handleActions({
 
 export const getShortUrlVisits = (buildShlinkApiClient) => (shortCode, query) => async (dispatch, getState) => {
   dispatch({ type: GET_SHORT_URL_VISITS_START });
-
   const { getShortUrlVisits } = await buildShlinkApiClient(getState);
   const itemsPerPage = 5000;
   const isLastPage = ({ currentPage, pagesCount }) => currentPage >= pagesCount;