diff --git a/src/Frontend/src/stores/ConfigurationStore.ts b/src/Frontend/src/stores/ConfigurationStore.ts
index b7e4b9fbd..231f1e6a4 100644
--- a/src/Frontend/src/stores/ConfigurationStore.ts
+++ b/src/Frontend/src/stores/ConfigurationStore.ts
@@ -22,7 +22,6 @@ export const useConfigurationStore = defineStore("ConfigurationStore", () => {
 
   return {
     configuration,
-    refresh,
     isMassTransitConnected,
   };
 });
diff --git a/src/Frontend/src/stores/EditRetryStore.ts b/src/Frontend/src/stores/EditRetryStore.ts
deleted file mode 100644
index 2fe34e8c5..000000000
--- a/src/Frontend/src/stores/EditRetryStore.ts
+++ /dev/null
@@ -1,25 +0,0 @@
-import { acceptHMRUpdate, defineStore } from "pinia";
-import { ref } from "vue";
-import { EditAndRetryConfig } from "@/resources/Configuration";
-import { useServiceControlStore } from "./ServiceControlStore";
-
-export const useEditRetryStore = defineStore("EditRetryStore", () => {
-  const config = ref<EditAndRetryConfig>({ enabled: false, locked_headers: [], sensitive_headers: [] });
-  const serviceControlStore = useServiceControlStore();
-
-  async function loadConfig() {
-    const [, data] = await serviceControlStore.fetchTypedFromServiceControl<EditAndRetryConfig>("edit/config");
-    config.value = data;
-  }
-
-  return {
-    config,
-    loadConfig,
-  };
-});
-
-if (import.meta.hot) {
-  import.meta.hot.accept(acceptHMRUpdate(useEditRetryStore, import.meta.hot));
-}
-
-export type EditRetryStore = ReturnType<typeof useEditRetryStore>;
diff --git a/src/Frontend/src/stores/MessageStore.ts b/src/Frontend/src/stores/MessageStore.ts
index 97f714feb..9dfaf5ea9 100644
--- a/src/Frontend/src/stores/MessageStore.ts
+++ b/src/Frontend/src/stores/MessageStore.ts
@@ -1,9 +1,8 @@
 import { acceptHMRUpdate, defineStore, storeToRefs } from "pinia";
-import { computed, reactive, ref } from "vue";
+import { computed, reactive, ref, watch } from "vue";
 import Header from "@/resources/Header";
 import type EndpointDetails from "@/resources/EndpointDetails";
 import { FailedMessage, ExceptionDetails, FailedMessageStatus } from "@/resources/FailedMessage";
-import { useEditRetryStore } from "@/stores/EditRetryStore";
 import { useConfigurationStore } from "@/stores/ConfigurationStore";
 import Message, { MessageStatus } from "@/resources/Message";
 import moment from "moment/moment";
@@ -11,6 +10,7 @@ import { parse, stringify } from "lossless-json";
 import xmlFormat from "xml-formatter";
 import { DataContainer } from "./DataContainer";
 import { useServiceControlStore } from "./ServiceControlStore";
+import { EditAndRetryConfig } from "@/resources/Configuration";
 
 interface Model {
   id?: string;
@@ -62,19 +62,25 @@ export const useMessageStore = defineStore("MessageStore", () => {
   const headers = ref<DataContainer<Header[]>>({ data: [] });
   const body = ref<DataContainer<{ value?: string; content_type?: string; no_content?: boolean }>>({ data: {} });
   const state = reactive<DataContainer<Model>>({ data: { failure_metadata: {}, failure_status: {}, dialog_status: {}, invoked_saga: {} } });
+  const edit_and_retry_config = ref<EditAndRetryConfig>({ enabled: false, locked_headers: [], sensitive_headers: [] });
+  const conversationData = ref<DataContainer<Message[]>>({ data: [] });
+
   let bodyLoadedId = "";
   let conversationLoadedId = "";
-  const conversationData = ref<DataContainer<Message[]>>({ data: [] });
-  const editRetryStore = useEditRetryStore();
+
   const configStore = useConfigurationStore();
   const serviceControlStore = useServiceControlStore();
+  const { serviceControlUrl } = storeToRefs(serviceControlStore);
 
-  const { config: edit_and_retry_config } = storeToRefs(editRetryStore);
   const { configuration } = storeToRefs(configStore);
   const error_retention_period = computed(() => moment.duration(configuration.value?.data_retention?.error_retention_period).asHours());
 
-  // eslint-disable-next-line promise/catch-or-return,promise/prefer-await-to-then,promise/valid-params
-  Promise.all([editRetryStore.loadConfig(), configStore.refresh()]).then();
+  watch(serviceControlUrl, loadConfig, { immediate: true });
+  async function loadConfig() {
+    if (!serviceControlUrl.value) return;
+    const [, data] = await serviceControlStore.fetchTypedFromServiceControl<EditAndRetryConfig>("edit/config");
+    edit_and_retry_config.value = data;
+  }
 
   function reset() {
     state.data = { failure_metadata: {}, failure_status: {}, dialog_status: {}, invoked_saga: {} };