diff --git a/apps/api/src/app/activities/activities.service.ts b/apps/api/src/app/activities/activities.service.ts
index 427cddf4c..32fe61349 100644
--- a/apps/api/src/app/activities/activities.service.ts
+++ b/apps/api/src/app/activities/activities.service.ts
@@ -952,15 +952,15 @@ export class ActivitiesService {
 
     let isDraft = false;
 
+    if (!data.account?.connect?.id_userId?.id) {
+      data.account = { disconnect: true };
+    }
+
     if (
       ['FEE', 'INTEREST', 'LIABILITY'].includes(data.type) ||
       (data.SymbolProfile.connect.dataSource_symbol.dataSource === 'MANUAL' &&
         data.type === 'BUY')
     ) {
-      if (data.account?.connect?.id_userId?.id === null) {
-        data.account = { disconnect: true };
-      }
-
       delete data.SymbolProfile.connect;
       delete data.SymbolProfile.update.name;
     } else {