diff --git a/app/Http/Livewire/School/EventTable.php b/app/Http/Livewire/School/EventTable.php
index 4720de9f..10f397e3 100644
--- a/app/Http/Livewire/School/EventTable.php
+++ b/app/Http/Livewire/School/EventTable.php
@@ -26,29 +26,31 @@ class EventTable extends Component
     {
         return view('livewire.school.event-table', [
             'markers' => CourseEvent::query()
-                                     ->with([
-                                         'course',
-                                         'venue.city.country',
-                                     ])
-                                     ->where(fn($query) => $query
-                                         ->whereHas('venue.city.country',
-                                             fn($query) => $query->where('countries.code', $this->country->code))
-                                     )
-                                     ->get()
-                                     ->map(fn($event) => [
-                                         'id'     => $event->id,
-                                         'name'   => $event->course->name,
-                                         'coords' => [$event->venue->city->latitude, $event->venue->city->longitude],
-                                     ]),
+                                    ->with([
+                                        'course',
+                                        'venue.city.country',
+                                    ])
+                                    ->where('from', '>=', now())
+                                    ->where(fn($query) => $query
+                                        ->whereHas('venue.city.country',
+                                            fn($query) => $query->where('countries.code', $this->country->code))
+                                    )
+                                    ->get()
+                                    ->map(fn($event) => [
+                                        'id'     => $event->id,
+                                        'name'   => $event->course->name,
+                                        'coords' => [$event->venue->city->latitude, $event->venue->city->longitude],
+                                    ]),
             'events'  => CourseEvent::query()
-                                     ->get()
-                                     ->map(fn($event) => [
-                                         'id'          => $event->id,
-                                         'startDate'   => $event->from,
-                                         'endDate'     => $event->to,
-                                         'location'    => $event->course->name,
-                                         'description' => $event->venue->name,
-                                     ]),
+                                    ->where('from', '>=', now())
+                                    ->get()
+                                    ->map(fn($event) => [
+                                        'id'          => $event->id,
+                                        'startDate'   => $event->from,
+                                        'endDate'     => $event->to,
+                                        'location'    => $event->course->name,
+                                        'description' => $event->venue->name,
+                                    ]),
         ])->layout('layouts.app', [
             'SEOData' => new SEOData(
                 title: __('Dates'),
diff --git a/app/Http/Livewire/School/LecturerLandingPage.php b/app/Http/Livewire/School/LecturerLandingPage.php
index 7e18ac78..22f9a210 100644
--- a/app/Http/Livewire/School/LecturerLandingPage.php
+++ b/app/Http/Livewire/School/LecturerLandingPage.php
@@ -22,14 +22,18 @@ class LecturerLandingPage extends Component
     {
         return view('livewire.school.lecturer-landing-page', [
             'courseEvents' => CourseEvent::query()
+                                         ->where('from', '>=', now())
                                          ->whereHas('course', function ($query) {
                                              $query->where('lecturer_id', $this->lecturer->id);
                                          })
+                                         ->orderBy('from')
                                          ->get(),
             'events'       => CourseEvent::query()
+                                         ->where('from', '>=', now())
                                          ->whereHas('course', function ($query) {
                                              $query->where('lecturer_id', $this->lecturer->id);
                                          })
+                                         ->orderBy('from')
                                          ->get()
                                          ->map(fn($event) => [
                                              'id'          => $event->id,
diff --git a/app/Http/Livewire/Tables/EventTable.php b/app/Http/Livewire/Tables/EventTable.php
index a4de5b03..48e4a1f1 100644
--- a/app/Http/Livewire/Tables/EventTable.php
+++ b/app/Http/Livewire/Tables/EventTable.php
@@ -164,10 +164,11 @@ class EventTable extends DataTableComponent
     {
         return CourseEvent::query()
                           ->withCount([
-                        'registrations',
-                    ])
+                              'registrations',
+                          ])
+                          ->where('from', '>=', now())
                           ->whereHas('venue.city.country',
-                        fn($query) => $query->where('countries.code', $this->country));
+                              fn($query) => $query->where('countries.code', $this->country));
     }
 
     public function viewHistoryModal($modelId): void