diff --git a/Http/Controllers/CityController.php b/Http/Controllers/CityController.php
index 2a312ca..f47c684 100644
--- a/Http/Controllers/CityController.php
+++ b/Http/Controllers/CityController.php
@@ -50,7 +50,10 @@
 
             $countries = Country::all();
 
-            return $dataTable->render($this->module->alias . '::city.index', compact('countries'));
+            $_table = $dataTable->render($this->module->alias . '::city.index', compact('countries'));
+            if(!empty($_table->data)){
+                return $_table;
+            }
         }
 
         /**
diff --git a/Http/Controllers/ProvinceController.php b/Http/Controllers/ProvinceController.php
index 49ddb53..c153c74 100644
--- a/Http/Controllers/ProvinceController.php
+++ b/Http/Controllers/ProvinceController.php
@@ -41,13 +41,16 @@
                 abort(403, 'Sorry !! You are Unauthorized to view any ' . $this->module->alias . ' !');
             }
 
-            if ($request->country_id) {
+           if (isset($request->country_id) && !empty($request->country_id)) {
                 $this->show($request);
                 return;
             }
 
             $countries = Country::all();
-            return $dataTable->render($this->module->alias . '::province.index', compact('countries'));
+            $_table = $dataTable->render($this->module->alias . '::province.index', compact('countries'));
+            if(!empty($_table->data)){
+                return $_table;
+            }
         }
 
         /**
diff --git a/Resources/views/district/index.blade.php b/Resources/views/district/index.blade.php
index 4a8f67e..1c98638 100644
--- a/Resources/views/district/index.blade.php
+++ b/Resources/views/district/index.blade.php
@@ -125,8 +125,8 @@
 
                 $('#kt_modal_{{$route[0].'_'.$route[1]}}').on('hidden.bs.modal', function (e) {
                     $(".form_{{$route[0].'_'.$route[1]}}")[0].reset();
-                    $('#{{$route[0].'_'.$route[1]}}_province_id').val(null).trigger('change');
                     $('#{{$route[0].'_'.$route[1]}}_country_id').val(null).trigger('change');
+                    $('#{{$route[0].'_'.$route[1]}}_province_id').val(null).trigger('change');
                     $('#{{$route[0].'_'.$route[1]}}_city_id').val(null).trigger('change');
                     $(".form_{{$route[0].'_'.$route[1]}}").attr('action', "{{ route($route[0].'.'.$route[1].'.store') }}");
                     $(".form_{{$route[0].'_'.$route[1]}}").find('input[name="_method"]').remove();