diff --git a/app/Http/Controllers/Admin/FlightController.php b/app/Http/Controllers/Admin/FlightController.php
index daae3168..c5358cb2 100644
--- a/app/Http/Controllers/Admin/FlightController.php
+++ b/app/Http/Controllers/Admin/FlightController.php
@@ -54,7 +54,7 @@ class FlightController extends BaseController
      */
     public function index(Request $request)
     {
-        $flights = $this->flightRepo->searchCriteria($request)->paginate();
+        $flights = $this->flightRepo->searchCriteria($request, false)->paginate();
         return view('admin.flights.index', [
             'flights' => $flights,
             'airlines' => $this->airlineRepo->selectBoxList(true),
@@ -85,6 +85,8 @@ class FlightController extends BaseController
     {
         $input = $request->all();
 
+        $input['active'] = true;
+
         $flight = $this->flightRepo->create($input);
 
         Flash::success('Flight saved successfully.');
@@ -148,7 +150,9 @@ class FlightController extends BaseController
             return redirect(route('admin.flights.index'));
         }
 
-        $flight = $this->flightRepo->update($request->all(), $id);
+        $attrs = $request->all();
+        $attrs['active'] = true;
+        $flight = $this->flightRepo->update($attrs, $id);
 
         Flash::success('Flight updated successfully.');
         return redirect(route('admin.flights.index'));
diff --git a/app/Repositories/FlightRepository.php b/app/Repositories/FlightRepository.php
index 5594b092..dafb64f3 100644
--- a/app/Repositories/FlightRepository.php
+++ b/app/Repositories/FlightRepository.php
@@ -35,9 +35,11 @@ class FlightRepository extends BaseRepository implements CacheableInterface
      */
     public function searchCriteria(Request $request, bool $only_active=true)
     {
-        $where = [
-            'active' => $only_active,
-        ];
+        $where = [];
+
+        if($only_active === true) {
+            $where['active'] = $only_active;
+        }
 
         if ($request->filled('flight_id')) {
             $where['id'] = $request->flight_id;