diff --git a/web/ui/dashboard/src/app/private/components/create-subscription/create-subscription.component.spec.ts b/web/ui/dashboard/src/app/private/components/create-subscription/create-subscription.component.spec.ts
index 28bdf28801..7fc18a537d 100644
--- a/web/ui/dashboard/src/app/private/components/create-subscription/create-subscription.component.spec.ts
+++ b/web/ui/dashboard/src/app/private/components/create-subscription/create-subscription.component.spec.ts
@@ -1,25 +1,93 @@
 import { ComponentFixture, TestBed } from '@angular/core/testing';
+import { ReactiveFormsModule, FormBuilder } from '@angular/forms';
+import { RouterTestingModule } from '@angular/router/testing';
+import { NO_ERRORS_SCHEMA } from '@angular/core';
 
 import { CreateSubscriptionComponent } from './create-subscription.component';
+import { PrivateService } from '../../private.service';
+import { CreateSubscriptionService } from './create-subscription.service';
+import { LicensesService } from 'src/app/services/licenses/licenses.service';
+import { FilterService } from './filter.service';
+import { RbacService } from 'src/app/services/rbac/rbac.service';
 
 describe('CreateSubscriptionComponent', () => {
   let component: CreateSubscriptionComponent;
   let fixture: ComponentFixture<CreateSubscriptionComponent>;
 
+  const mockPrivateService = {
+    getProjectDetails: { type: 'outgoing', uid: 'test-project' },
+    getEndpoints: () => Promise.resolve({ data: { content: [] } }),
+    getSources: () => Promise.resolve({ data: { content: [] } }),
+    getEventTypes: () => Promise.resolve({ data: [] }),
+    getProjectStat: () => Promise.resolve({}),
+    getSubscriptions: () => {}
+  };
+
+  const mockCreateSubscriptionService = {
+    createSubscription: () => Promise.resolve({ data: { uid: 'sub-1' } }),
+    updateSubscription: () => Promise.resolve({ data: {} }),
+    getSubscriptionDetail: () => Promise.resolve({ data: {} })
+  };
+
+  const mockLicensesService = { hasLicense: () => true };
+
+  const mockFilterService = {
+    getFilters: () => Promise.resolve({ data: [] }),
+    createFilters: () => Promise.resolve({}),
+    bulkUpdateFilters: () => Promise.resolve({})
+  };
+
+  const mockRbacService = { userCanAccess: () => Promise.resolve(true) };
+
   beforeEach(async () => {
     await TestBed.configureTestingModule({
-      declarations: [ CreateSubscriptionComponent ]
-    })
-    .compileComponents();
+      declarations: [CreateSubscriptionComponent],
+      imports: [ReactiveFormsModule, RouterTestingModule],
+      providers: [
+        FormBuilder,
+        { provide: PrivateService, useValue: mockPrivateService },
+        { provide: CreateSubscriptionService, useValue: mockCreateSubscriptionService },
+        { provide: LicensesService, useValue: mockLicensesService },
+        { provide: FilterService, useValue: mockFilterService },
+        { provide: RbacService, useValue: mockRbacService }
+      ],
+      schemas: [NO_ERRORS_SCHEMA]
+    }).compileComponents();
   });
 
   beforeEach(() => {
     fixture = TestBed.createComponent(CreateSubscriptionComponent);
     component = fixture.componentInstance;
-    fixture.detectChanges();
+    // Avoid calling fixture.detectChanges() so ngOnInit's complex async
+    // flows do not run; tests set up component state directly.
   });
 
   it('should create', () => {
     expect(component).toBeTruthy();
   });
+
+  describe('saveSubscription - incoming project filter injection fix', () => {
+    beforeEach(() => {
+      component.subscriptionForm.patchValue({ name: 'Test Subscription', endpoint_id: 'ep-1' });
+    });
+
+    it('should not inject wildcard event type for incoming projects when selectedEventTypes is empty', async () => {
+      component.projectType = 'incoming';
+      component.selectedEventTypes = [];
+
+      await component.saveSubscription();
+
+      expect(component.selectedEventTypes).toEqual([]);
+      expect(component.selectedEventTypes).not.toContain('*');
+    });
+
+    it('should default selectedEventTypes to ["*"] for outgoing projects when empty', async () => {
+      component.projectType = 'outgoing';
+      component.selectedEventTypes = [];
+
+      await component.saveSubscription();
+
+      expect(component.selectedEventTypes).toContain('*');
+    });
+  });
 });
diff --git a/web/ui/dashboard/src/app/private/components/create-subscription/create-subscription.component.ts b/web/ui/dashboard/src/app/private/components/create-subscription/create-subscription.component.ts
index 11c5616dc3..ad11b899cc 100644
--- a/web/ui/dashboard/src/app/private/components/create-subscription/create-subscription.component.ts
+++ b/web/ui/dashboard/src/app/private/components/create-subscription/create-subscription.component.ts
@@ -423,8 +423,8 @@ export class CreateSubscriptionComponent implements OnInit {
 
 		// STEP 1: Handle event type selection and ensure mutual exclusivity with wildcard (*)
 
-		// If no event types are selected, use the wildcard
-		if (this.selectedEventTypes.length === 0) {
+		// If no event types are selected, use the wildcard (outgoing projects only)
+		if (this.selectedEventTypes.length === 0 && this.projectType !== 'incoming') {
 			console.log('No event types selected, using wildcard (*)');
 			this.selectedEventTypes = ['*'];
 		}
diff --git a/web/ui/dashboard/src/app/private/pages/project/subscriptions/subscriptions.component.html b/web/ui/dashboard/src/app/private/pages/project/subscriptions/subscriptions.component.html
index 1cbdeb8743..c338d1c37e 100644
--- a/web/ui/dashboard/src/app/private/pages/project/subscriptions/subscriptions.component.html
+++ b/web/ui/dashboard/src/app/private/pages/project/subscriptions/subscriptions.component.html
@@ -87,7 +87,7 @@ <h1 class="text-18 font-bold text-neutral-12 mb-24px">Subscriptions</h1>
 					<div class="flex items-center pl-16px min-w-[370px]" *ngIf="privateService.getProjectDetails?.type === 'incoming'">
 						<div class="flex items-center">
 							<span class="max-w-[150px] truncate">{{ subscription.source_metadata?.name }}</span>
-							<div convoy-tag *ngIf="subscription.source_metadata?.verifier?.type !== 'noop'" class="flex items-center ml-8px bg-neutral-4 !py-2px !px-8px text-10">
+							<div convoy-tag *ngIf="subscription.source_metadata?.verifier?.type && subscription.source_metadata?.verifier?.type !== 'noop'" class="flex items-center ml-8px bg-neutral-4 !py-2px !px-8px text-10">
 								{{ subscription.source_metadata?.provider || ((subscription.source_metadata?.verifier?.type ?? '') | sourceValue : 'verifier') }}
 							</div>
 						</div>