diff --git a/packages/client-ui/pages/analyses/[id]/results.vue b/packages/client-ui/pages/analyses/[id]/results.vue
index 0cd89f63e..6a37e31f5 100644
--- a/packages/client-ui/pages/analyses/[id]/results.vue
+++ b/packages/client-ui/pages/analyses/[id]/results.vue
@@ -40,7 +40,6 @@ export default defineNuxtComponent({
         <FAnalysisBucket :query="query">
             <template #default="{ data: bucket }">
                 <FAnalysisBucketFiles
-                    v-if="entity"
                     :query="{ filters: { bucket_id: bucket.id } }"
                 >
                     <template #itemActions="{ data }">
diff --git a/packages/client-ui/plugins/01.auth.ts b/packages/client-ui/plugins/01.auth.ts
index 742ad0853..2f338e88c 100644
--- a/packages/client-ui/plugins/01.auth.ts
+++ b/packages/client-ui/plugins/01.auth.ts
@@ -7,7 +7,7 @@
 
 import { install } from '@authup/client-web-kit';
 import type { Pinia } from 'pinia';
-import { useCookie } from '#imports';
+import { tryUseNuxtApp, useCookie } from '#imports';
 
 export default defineNuxtPlugin({
     setup(ctx) {
@@ -18,16 +18,27 @@ export default defineNuxtPlugin({
             pinia: ctx.$pinia as Pinia,
             baseURL,
             cookieSet: (key, value) => {
-                const cookie = useCookie(key);
-                cookie.value = value;
+                const app = tryUseNuxtApp();
+                if (app) {
+                    const cookie = useCookie(key);
+                    cookie.value = value;
+                }
             },
             cookieUnset: (key) => {
-                const cookie = useCookie(key);
-                cookie.value = null;
+                const app = tryUseNuxtApp();
+                if (app) {
+                    const cookie = useCookie(key);
+                    cookie.value = null;
+                }
             },
             cookieGet: (key) => {
-                const cookie = useCookie(key);
-                return cookie.value;
+                const app = tryUseNuxtApp();
+                if (app) {
+                    const cookie = useCookie(key);
+                    return cookie.value;
+                }
+
+                return null;
             },
         });
     },
diff --git a/packages/client-vue/src/components/analysis-bucket-file/FAnalysisBucketFile.vue b/packages/client-vue/src/components/analysis-bucket-file/FAnalysisBucketFile.vue
index 5872c26b8..5f67e4091 100644
--- a/packages/client-vue/src/components/analysis-bucket-file/FAnalysisBucketFile.vue
+++ b/packages/client-vue/src/components/analysis-bucket-file/FAnalysisBucketFile.vue
@@ -40,7 +40,7 @@ export default defineComponent({
     },
     setup(props, setup) {
         const manager = createEntityManager({
-            type: `${DomainType.ANALYSIS_FILE}`,
+            type: `${DomainType.ANALYSIS_BUCKET_FILE}`,
             props,
             setup,
         });
diff --git a/packages/client-vue/src/components/analysis-bucket-file/FAnalysisBucketFiles.ts b/packages/client-vue/src/components/analysis-bucket-file/FAnalysisBucketFiles.ts
index 9f406cbef..509b1c4d1 100644
--- a/packages/client-vue/src/components/analysis-bucket-file/FAnalysisBucketFiles.ts
+++ b/packages/client-vue/src/components/analysis-bucket-file/FAnalysisBucketFiles.ts
@@ -30,7 +30,7 @@ const FAnalysisBucketFiles = defineComponent({
             render,
             setDefaults,
         } = createList({
-            type: `${DomainType.ANALYSIS_FILE}`,
+            type: `${DomainType.ANALYSIS_BUCKET_FILE}`,
             props,
             setup,
         });
diff --git a/packages/core/src/domains/analysis-bucket-file/entity.ts b/packages/core/src/domains/analysis-bucket-file/entity.ts
index 7d310f160..e4e22bdc6 100644
--- a/packages/core/src/domains/analysis-bucket-file/entity.ts
+++ b/packages/core/src/domains/analysis-bucket-file/entity.ts
@@ -50,6 +50,6 @@ export interface AnalysisBucketFile {
 }
 
 export type AnalysisFileEventContext = DomainEventBaseContext & {
-    type: `${DomainType.ANALYSIS_FILE}`,
+    type: `${DomainType.ANALYSIS_BUCKET_FILE}`,
     data: AnalysisBucketFile
 };
diff --git a/packages/core/src/domains/constants.ts b/packages/core/src/domains/constants.ts
index ea98579e8..e1b20ca01 100644
--- a/packages/core/src/domains/constants.ts
+++ b/packages/core/src/domains/constants.ts
@@ -16,7 +16,7 @@ export enum DomainType {
     SERVICE = 'service',
     ANALYSIS = 'analysis',
     ANALYSIS_BUCKET = 'analysisBucket',
-    ANALYSIS_FILE = 'analysisFile',
+    ANALYSIS_BUCKET_FILE = 'analysisBucketFile',
     ANALYSIS_LOG = 'analysisLog',
     ANALYSIS_NODE = 'analysisNode',
 }
diff --git a/packages/core/src/domains/types.ts b/packages/core/src/domains/types.ts
index 5adefb63a..d13be1739 100644
--- a/packages/core/src/domains/types.ts
+++ b/packages/core/src/domains/types.ts
@@ -54,7 +54,7 @@ export type DomainEventContext<T extends `${DomainType}` | `${DomainSubType}`> =
                                         AnalysisBucketEventContext :
                                         T extends `${DomainType.ANALYSIS_LOG}` ?
                                             AnalysisLogEventContext :
-                                            T extends `${DomainType.ANALYSIS_FILE}` ?
+                                            T extends `${DomainType.ANALYSIS_BUCKET_FILE}` ?
                                                 AnalysisFileEventContext :
                                                 T extends `${DomainType.ANALYSIS_NODE}` | `${DomainSubType.ANALYSIS_NODE_IN}` | `${DomainSubType.ANALYSIS_NODE_OUT}` ?
                                                     TrainStationEventContext :
@@ -81,7 +81,7 @@ export type DomainEntity<T extends `${DomainType}` | `${DomainSubType}`> =
                                         AnalysisBucket :
                                         T extends `${DomainType.ANALYSIS_LOG}` ?
                                             AnalysisLog :
-                                            T extends `${DomainType.ANALYSIS_FILE}` ?
+                                            T extends `${DomainType.ANALYSIS_BUCKET_FILE}` ?
                                                 AnalysisBucketFile :
                                                 T extends `${DomainType.ANALYSIS_NODE}` | `${DomainSubType.ANALYSIS_NODE_IN}` | `${DomainSubType.ANALYSIS_NODE_OUT}` ?
                                                     AnalysisNode :
diff --git a/packages/server-core/src/database/subscribers/analysis-file.ts b/packages/server-core/src/database/subscribers/analysis-file.ts
index 72aa6fd0a..f292f3ab4 100644
--- a/packages/server-core/src/database/subscribers/analysis-file.ts
+++ b/packages/server-core/src/database/subscribers/analysis-file.ts
@@ -28,16 +28,16 @@ async function publishEvent(
     await publishDomainEvent(
         useRedisPublishClient(),
         {
-            type: DomainType.ANALYSIS_FILE,
+            type: DomainType.ANALYSIS_BUCKET_FILE,
             event,
             data,
         },
         [
             {
-                channel: (id) => buildDomainChannelName(DomainType.ANALYSIS_FILE, id),
+                channel: (id) => buildDomainChannelName(DomainType.ANALYSIS_BUCKET_FILE, id),
             },
             {
-                channel: (id) => buildDomainChannelName(DomainType.ANALYSIS_FILE, id),
+                channel: (id) => buildDomainChannelName(DomainType.ANALYSIS_BUCKET_FILE, id),
                 namespace: buildDomainNamespaceName(data.realm_id),
             },
         ],
diff --git a/packages/server-realtime/src/socket/namespaces/resources/controllers/analysis-file/handlers.ts b/packages/server-realtime/src/socket/namespaces/resources/controllers/analysis-file/handlers.ts
index 4f1f3b53a..7e03ad0b0 100644
--- a/packages/server-realtime/src/socket/namespaces/resources/controllers/analysis-file/handlers.ts
+++ b/packages/server-realtime/src/socket/namespaces/resources/controllers/analysis-file/handlers.ts
@@ -28,7 +28,7 @@ export function registerAnalysisFileSocketHandlers(socket: ResourcesNamespaceSoc
     if (!socket.data.userId && !socket.data.robotId) return;
 
     socket.on(
-        buildDomainEventSubscriptionFullName(DomainType.ANALYSIS_FILE, DomainEventSubscriptionName.SUBSCRIBE),
+        buildDomainEventSubscriptionFullName(DomainType.ANALYSIS_BUCKET_FILE, DomainEventSubscriptionName.SUBSCRIBE),
         async (target, cb) => {
             if (!socket.data.abilities.has(PermissionID.ANALYSIS_EDIT)) {
                 if (isEventCallback(cb)) {
@@ -38,7 +38,7 @@ export function registerAnalysisFileSocketHandlers(socket: ResourcesNamespaceSoc
                 return;
             }
 
-            subscribeSocketRoom(socket, buildDomainChannelName(DomainType.ANALYSIS_FILE, target));
+            subscribeSocketRoom(socket, buildDomainChannelName(DomainType.ANALYSIS_BUCKET_FILE, target));
 
             if (isEventCallback(cb)) {
                 cb(null);
@@ -47,9 +47,9 @@ export function registerAnalysisFileSocketHandlers(socket: ResourcesNamespaceSoc
     );
 
     socket.on(
-        buildDomainEventSubscriptionFullName(DomainType.ANALYSIS_FILE, DomainEventSubscriptionName.UNSUBSCRIBE),
+        buildDomainEventSubscriptionFullName(DomainType.ANALYSIS_BUCKET_FILE, DomainEventSubscriptionName.UNSUBSCRIBE),
         (target) => {
-            unsubscribeSocketRoom(socket, buildDomainChannelName(DomainType.ANALYSIS_FILE, target));
+            unsubscribeSocketRoom(socket, buildDomainChannelName(DomainType.ANALYSIS_BUCKET_FILE, target));
         },
     );
 }