diff --git a/src/Bones.UI/core/composableFactory.ts b/src/Bones.UI/core/composableFactory.ts
index 9a3f90c..f671d33 100644
--- a/src/Bones.UI/core/composableFactory.ts
+++ b/src/Bones.UI/core/composableFactory.ts
@@ -1,4 +1,4 @@
-import { Ref, onUnmounted, ref, computed, computed } from "vue";
+import { Ref, onUnmounted, ref, computed } from "vue";
 
 import { FilterFactory } from "./filterFactory";
 import { INotifyService } from "../abstractions";
@@ -54,6 +54,28 @@ export class ComposableFactory {
     }
 
 
+    public static subscribe<TDetails>(service: INotifyService<TDetails>) {
+        return () => {
+            let subscribersIds: number[] = [];
+
+            onUnmounted(() => {
+                subscribersIds.forEach(id => service.unsubscribe(id));
+                subscribersIds = [];
+            });
+
+            const subscribe: INotifyService<TDetails>["subscribe"] = (ev: any, callback: any) => {
+                const subscriberId = service.subscribe(ev, callback);
+                subscribersIds.push(subscriberId);
+                return subscriberId;
+            }
+
+            return {
+                subscribe
+            }
+        }
+    }
+
+
     public static customGet<TDetails, TArgs extends any[]>(service: INotifyService<TDetails>, method: (...args: TArgs) => Promise<TDetails>, applyFactory?: () => (entity: Ref<TDetails>) => void) {
         return () => {
             const apply = applyFactory ? applyFactory() : () => { };
diff --git a/tests/Bones.UI.Tests/services/testUserService.ts b/tests/Bones.UI.Tests/services/testUserService.ts
index 71e8032..81ae916 100644
--- a/tests/Bones.UI.Tests/services/testUserService.ts
+++ b/tests/Bones.UI.Tests/services/testUserService.ts
@@ -23,13 +23,13 @@ const AccountLoginFactory = new ServiceFactory<TestUserDetailsDTO, TestUserDetai
 export const useTestUsersSync = ComposableFactory.sync<TestUserDetails, TestUserInfos>(testUserServiceFactory);
 export const useTestUserTrack = ComposableFactory.trackRef(testUserServiceFactory);
 
-// export const useTestUserSubscribe = ComposableFactory.subscribe(testUserServiceFactory);
+export const useTestUserSubscribe = ComposableFactory.subscribe(testUserServiceFactory);
 
-// const { subscribe } = useTestUserSubscribe();
+const { subscribe } = useTestUserSubscribe();
 
-// subscribe("add", (ev, payload) => {
-//     console.log(ev, payload);
-// });
+subscribe("delete", (ev, payload) => {
+    console.log(ev, payload);
+});
 
 export const useLogin = ComposableFactory.custom(AccountLoginFactory.login, () => {
     const { sync } = useTestUsersSync();