diff --git a/src/i18n/messages.js b/src/i18n/messages.js
index 76d6b5386..db80f7ac3 100644
--- a/src/i18n/messages.js
+++ b/src/i18n/messages.js
@@ -20,7 +20,7 @@ const languageFileMap = import.meta.glob(['./*.json', '!./en.json'])
 
 const loadLanguageFile = (code) => {
   const jsonName = langCodeToJsonName(code)
-  if (jsonName === 'en') return Promise.resolve({ default: enMessages })
+  if (jsonName === 'en') return { default: enMessages }
   return languageFileMap[`./${jsonName}.json`]()
 }
 
diff --git a/src/modules/users.js b/src/modules/users.js
index 0988b45c5..c4af0fb36 100644
--- a/src/modules/users.js
+++ b/src/modules/users.js
@@ -76,10 +76,10 @@ const mergeArrayLength = (oldValue, newValue) => {
 const getNotificationPermission = () => {
   const Notification = window.Notification
 
-  if (!Notification) return Promise.resolve(null)
+  if (!Notification) return null
   if (Notification.permission === 'default')
     return Notification.requestPermission()
-  return Promise.resolve(Notification.permission)
+  return Notification.permission
 }
 
 const blockUser = (store, args) => {
@@ -388,7 +388,7 @@ const users = {
       if (!user) {
         return store.dispatch('fetchUser', id)
       } else {
-        return Promise.resolve(user)
+        return user
       }
     },
     updateUserAdminData(store, { userAdminData }) {
diff --git a/src/services/style_setter/style_setter.js b/src/services/style_setter/style_setter.js
index 68e0632bf..a6f22e50b 100644
--- a/src/services/style_setter/style_setter.js
+++ b/src/services/style_setter/style_setter.js
@@ -316,7 +316,7 @@ export const getResourcesIndex = async (url, parser = (x) => x) => {
   const resourceTransform = (resources) => {
     return Object.entries(resources).map(([k, v]) => {
       if (typeof v === 'object') {
-        return [k, () => Promise.resolve(v)]
+        return [k, () => v]
       } else if (typeof v === 'string') {
         return [
           k,
@@ -361,5 +361,5 @@ export const getResourcesIndex = async (url, parser = (x) => x) => {
   if (total.length === 0) {
     throw new Error(`Resource at ${url} and ${customUrl} completely unavailable. Panicking`)
   }
-  return Promise.resolve(Object.fromEntries(total))
+  return Object.fromEntries(total)
 }
diff --git a/src/services/sw/sw.js b/src/services/sw/sw.js
index 30c95406b..53c7b0cf2 100644
--- a/src/services/sw/sw.js
+++ b/src/services/sw/sw.js
@@ -40,10 +40,10 @@ function subscribePush(registration, isEnabled, vapidPublicKey) {
   return registration.pushManager.subscribe(subscribeOptions)
 }
 
-function unsubscribePush(registration) {
+async function unsubscribePush(registration) {
   return registration.pushManager.getSubscription().then((subscription) => {
     if (subscription === null) {
-      return Promise.resolve('No subscription')
+      return 'No subscription'
     }
     return subscription.unsubscribe()
   })
diff --git a/src/stores/interface.js b/src/stores/interface.js
index edc879614..7be72a8d2 100644
--- a/src/stores/interface.js
+++ b/src/stores/interface.js
@@ -294,7 +294,7 @@ export const useInterfaceStore = defineStore('interface', {
           path: 'palettesIndex',
           value: { _error: e },
         })
-        return Promise.resolve({})
+        return {}
       }
     },
     setPalette(value) {
@@ -332,7 +332,7 @@ export const useInterfaceStore = defineStore('interface', {
           path: 'simple.stylesIndex',
           value: { _error: e },
         })
-        return Promise.resolve({})
+        return {}
       }
     },
     setStyle(value) {
@@ -375,7 +375,7 @@ export const useInterfaceStore = defineStore('interface', {
           path: 'themesIndex',
           value: { _error: e },
         })
-        return Promise.resolve({})
+        return {}
       }
     },
     setTheme(value) {