diff --git a/VERSION.txt b/VERSION.txt
index 5f3d50881709..40fdb9da290f 100644
--- a/VERSION.txt
+++ b/VERSION.txt
@@ -1 +1 @@
-5.8.29
\ No newline at end of file
+5.8.30
\ No newline at end of file
diff --git a/app/DataMapper/Tax/BaseRule.php b/app/DataMapper/Tax/BaseRule.php
index ccc0d46a4449..d921f2006887 100644
--- a/app/DataMapper/Tax/BaseRule.php
+++ b/app/DataMapper/Tax/BaseRule.php
@@ -271,7 +271,7 @@ class BaseRule implements RuleInterface
     public function isTaxableRegion(): bool
     {
         return $this->client->company->tax_data->regions->{$this->client_region}->tax_all_subregions ||
-        (property_exists($this->client->company->tax_data->regions->{$this->client_region}->subregions, $this->client_subregion) && $this->client->company->tax_data->regions->{$this->client_region}->subregions->{$this->client_subregion}->apply_tax);
+        (property_exists($this->client->company->tax_data->regions->{$this->client_region}->subregions, $this->client_subregion) && ($this->client->company->tax_data->regions->{$this->client_region}->subregions->{$this->client_subregion}->apply_tax ?? false));
     }
 
     public function defaultForeign(): self
diff --git a/app/Filters/PaymentFilters.php b/app/Filters/PaymentFilters.php
index 5c0b733f9398..29b596e013e8 100644
--- a/app/Filters/PaymentFilters.php
+++ b/app/Filters/PaymentFilters.php
@@ -164,7 +164,7 @@ class PaymentFilters extends QueryFilters
     {
         $sort_col = explode('|', $sort);
 
-        if (!is_array($sort_col) || count($sort_col) != 2 || !in_array($sort_col, Schema::getColumnListing('payments'))) {
+        if (!is_array($sort_col) || count($sort_col) != 2 || !in_array($sort_col[0], Schema::getColumnListing('payments'))) {
             return $this->builder;
         }
 
diff --git a/app/Filters/UserFilters.php b/app/Filters/UserFilters.php
index 002562933ad9..7988265e327a 100644
--- a/app/Filters/UserFilters.php
+++ b/app/Filters/UserFilters.php
@@ -50,7 +50,7 @@ class UserFilters extends QueryFilters
     {
         $sort_col = explode('|', $sort);
 
-        if (!is_array($sort_col) || count($sort_col) != 2 || !in_array($sort_col, \Illuminate\Support\Facades\Schema::getColumnListing('users'))) {
+        if (!is_array($sort_col) || count($sort_col) != 2 || !in_array($sort_col[0], \Illuminate\Support\Facades\Schema::getColumnListing('users'))) {
             return $this->builder;
         }
 
diff --git a/config/ninja.php b/config/ninja.php
index 889e6874c022..3f9061733a16 100644
--- a/config/ninja.php
+++ b/config/ninja.php
@@ -17,8 +17,8 @@ return [
     'require_https' => env('REQUIRE_HTTPS', true),
     'app_url' => rtrim(env('APP_URL', ''), '/'),
     'app_domain' => env('APP_DOMAIN', 'invoicing.co'),
-    'app_version' => env('APP_VERSION', '5.8.29'),
-    'app_tag' => env('APP_TAG', '5.8.29'),
+    'app_version' => env('APP_VERSION', '5.8.30'),
+    'app_tag' => env('APP_TAG', '5.8.30'),
     'minimum_client_version' => '5.0.16',
     'terms_version' => '1.0.1',
     'api_secret' => env('API_SECRET', false),
diff --git a/database/migrations/2024_02_16_011055_smtp_configuration.php b/database/migrations/2024_02_16_011055_smtp_configuration.php
index 38e7ea54e53b..df54821c1b6e 100644
--- a/database/migrations/2024_02_16_011055_smtp_configuration.php
+++ b/database/migrations/2024_02_16_011055_smtp_configuration.php
@@ -19,7 +19,7 @@ return new class extends Migration
             $table->text('smtp_username')->nullable();
             $table->text('smtp_password')->nullable();
             $table->string('smtp_local_domain')->nullable();
-            $table->boolean('smtp_verify_peer')->default(0);
+            $table->boolean('smtp_verify_peer')->default(true);
         });
 
     }