diff --git a/packages/backend-core/src/context/index.js b/packages/backend-core/src/context/index.js
index 3abbc84596..0555556157 100644
--- a/packages/backend-core/src/context/index.js
+++ b/packages/backend-core/src/context/index.js
@@ -297,6 +297,10 @@ function getContextDB(key, opts) {
       toUseAppId = getDevelopmentAppID(appId)
       break
   }
+
+  //If the appId is specified, override context
+  toUseAppId = opts?.appId ? opts?.appId : toUseAppId
+
   db = dangerousGetDB(toUseAppId, opts)
   try {
     cls.setOnContext(key, db)
diff --git a/packages/server/src/api/controllers/application.ts b/packages/server/src/api/controllers/application.ts
index 2ca3c230c7..9e55964fa9 100644
--- a/packages/server/src/api/controllers/application.ts
+++ b/packages/server/src/api/controllers/application.ts
@@ -502,7 +502,7 @@ export const sync = async (ctx: any, next: any) => {
 }
 
 const updateAppPackage = async (appPackage: any, appId: any) => {
-  const db = getAppDB()
+  const db = getAppDB({ appId })
   const application = await db.get(DocumentTypes.APP_METADATA)
 
   const newAppPackage = { ...application, ...appPackage }