diff --git a/src/App.vue b/src/App.vue
index 209ffbb720..872fa67796 100644
--- a/src/App.vue
+++ b/src/App.vue
@@ -218,7 +218,7 @@ export default defineComponent({
       this.$store.commit('zap/toggleShowExceptionIcon', false)
     },
     async loadInitialEndpoints() {
-      let endpoint = await this.$store.dispatch('zap/loadComposition')
+      let endpoint = this.$store.dispatch('zap/loadComposition')
       if (endpoint) {
         this.$store.dispatch('zap/updateSelectedEndpointType', {
           endpointType: this.endpointType[endpoint.id],
diff --git a/src/boot/axios.js b/src/boot/axios.js
index c576bb1993..7a38cc233f 100644
--- a/src/boot/axios.js
+++ b/src/boot/axios.js
@@ -19,29 +19,13 @@ import axios from 'axios'
 import { v4 as uuidv4 } from 'uuid'
 import restApi from '../../src-shared/rest-api.js'
 import * as Util from '../util/util.js'
-const querystring = require('querystring')
 
 let zapUpdateExceptions = (payload, statusCode, message) => {}
 
 // You can set this to false to not log all the roundtrips
 const log = false
 
-let search = window.location.search
-if (search[0] === '?') {
-  search = search.substring(1)
-}
-let query = querystring.parse(search)
-let stsApplicationId = query['stsApplicationId']?.trim()
-let currentSessionUuid
-if (stsApplicationId) {
-  currentSessionUuid = window.sessionStorage.getItem('session_uuid')
-  window.sessionStorage.setItem(
-    'session_uuid',
-    currentSessionUuid + query[`stsApplicationId`]
-  )
-} else {
-  window.sessionStorage.setItem('session_uuid', uuidv4())
-}
+window.sessionStorage.setItem('session_uuid', uuidv4())
 
 /**
  * URL rewriter that can come handy in development mode.