diff --git a/src/app/pages/agenda/agenda.page.html b/src/app/pages/agenda/agenda.page.html
index 23740de68..4973e22ce 100644
--- a/src/app/pages/agenda/agenda.page.html
+++ b/src/app/pages/agenda/agenda.page.html
@@ -226,7 +226,7 @@
                   <div *ngFor="let event of events.value" class="EventListBox">
 
                     <div class="d-flex content-{{event.profile}}-{{event.event.CalendarName}} mt-10 cursor-pointer width-100 " (click)="eventClicked(event)" 
-                    *ngIf="viewEventMonth <= dateMonth(event)">
+                      *ngIf="viewEventMonth <= dateMonth(event) && event.event.CalendarName == segment || segment == 'Combinado' ">
                       <div class="schedule-time" *ngIf="!event.event.IsAllDayEvent">
 
                         <div *ngIf="!event.endMany && !event.middle" class="time-start">{{event.event.StartDate | date: 'HH:mm'}}</div>
@@ -266,7 +266,7 @@
                   </div>
                   <div *ngFor="let event of events.value" class="EventListBox" >
                     <div class="d-flex content-mdgpr-{{event.event.CalendarName}} mt-10 cursor-pointer" (click)="eventClicked(event)"
-                      *ngIf="viewEventMonth <= dateMonth(event)">
+                      *ngIf="viewEventMonth <= dateMonth(event) && event.event.CalendarName == segment || segment == 'Combinado' ">
                   
                       <div class="schedule-time" *ngIf="!event.event.IsAllDayEvent">
                         <div *ngIf="!event.endMany && !event.middle" class="time-start">{{event.event.StartDate | date: 'HH:mm'}}</div>
@@ -308,7 +308,7 @@
                   <div *ngFor="let event of events.value" class="EventListBox">
 
                     <div class="d-flex content-pr-{{event.event.CalendarName}} mt-10 cursor-pointer" (click)="eventClicked(event)"
-                    *ngIf="viewEventMonth <= dateMonth(event)">
+                      *ngIf="viewEventMonth <= dateMonth(event) && event.event.CalendarName == segment || segment == 'Combinado' ">
                     
                       <div class="schedule-time" *ngIf="!event.event.IsAllDayEvent">
                         <div *ngIf="!event.endMany && !event.middle" class="time-start">{{event.event.StartDate | date: 'HH:mm'}}</div>
diff --git a/src/app/pages/agenda/agenda.page.scss b/src/app/pages/agenda/agenda.page.scss
index 5d1962199..fca0b5083 100644
--- a/src/app/pages/agenda/agenda.page.scss
+++ b/src/app/pages/agenda/agenda.page.scss
@@ -460,7 +460,7 @@ td.monthview-primary-with-event {
     color: #2e2e2e !important;
     font-size: 13px;
   }
-  .EventListBox{
+  .EventListBoxBorder{
     padding-bottom: 5px;
     border-bottom: 1px solid #d8d8d8;
   }
diff --git a/src/app/pages/agenda/agenda.page.ts b/src/app/pages/agenda/agenda.page.ts
index 89ee25930..cf150eef7 100644
--- a/src/app/pages/agenda/agenda.page.ts
+++ b/src/app/pages/agenda/agenda.page.ts
@@ -1309,6 +1309,19 @@ export class AgendaPage implements OnInit {
       this.timelineFilterState = segments
     }
     this.showTimelineFilterState = false;
+
+
+
+    setTimeout(()=>{
+      document.querySelectorAll('.EventListBox-container .EventListBox').forEach((e)=>{
+        if(e.childElementCount == 0) {
+          e.parentElement.style.display = 'none'
+        } else {
+          e.parentElement.style.display = 'block'
+        }
+      })
+    }, 10)
+    
   }
 
 }
\ No newline at end of file
diff --git a/src/app/shared/agenda/new-event/new-event.page.ts b/src/app/shared/agenda/new-event/new-event.page.ts
index 7c826ee4c..9bac41b00 100644
--- a/src/app/shared/agenda/new-event/new-event.page.ts
+++ b/src/app/shared/agenda/new-event/new-event.page.ts
@@ -68,8 +68,6 @@ export class NewEventPage implements OnInit {
   public stepSecond = 5;
   public color: ThemePalette = 'primary';
 
-  james: any
-
   @Input() profile:string;
   @Input() selectedSegment: string;
   @Input() selectedDate: Date;