diff --git a/app/Http/Controllers/Frontend/FlightController.php b/app/Http/Controllers/Frontend/FlightController.php
index 853d454a..95301b9a 100644
--- a/app/Http/Controllers/Frontend/FlightController.php
+++ b/app/Http/Controllers/Frontend/FlightController.php
@@ -75,25 +75,30 @@ class FlightController extends Controller
     public function search(Request $request)
     {
         $where = [
-            'active'          => true,
-            'visible'         => true,
-            'airlines.active' => true,
+            'active'  => true,
+            'visible' => true,
         ];
 
+        /** @var \App\Models\User $user */
+        $user = Auth::user();
+
         if (setting('pilots.restrict_to_company')) {
-            $where['airline_id'] = Auth::user()->airline_id;
+            $where['airline_id'] = $user->airline_id;
         }
 
         // default restrictions on the flights shown. Handle search differently
         if (setting('pilots.only_flights_from_current')) {
-            $where['dpt_airport_id'] = Auth::user()->curr_airport_id;
+            $where['dpt_airport_id'] = $user->curr_airport_id;
         }
 
         $this->flightRepo->resetCriteria();
 
         try {
             $this->flightRepo->searchCriteria($request);
-            $this->flightRepo->pushCriteria(new WhereCriteria($request, $where));
+            $this->flightRepo->pushCriteria(new WhereCriteria($request, $where, [
+                'airline' => ['active' => true],
+            ]));
+
             $this->flightRepo->pushCriteria(new RequestCriteria($request));
         } catch (RepositoryException $e) {
             Log::emergency($e);