diff --git a/app/Http/Controllers/SettingsController.php b/app/Http/Controllers/SettingsController.php
index b89a221faa..603cc7455c 100755
--- a/app/Http/Controllers/SettingsController.php
+++ b/app/Http/Controllers/SettingsController.php
@@ -798,7 +798,12 @@ class SettingsController extends Controller
             $setting->labels_display_model = 0;
         }
 
+
         if ($setting->save()) {
+            if ($setting->label2_template === null) {
+                return redirect()->route('settings.labels.index')->with('error', trans('admin/settings/message.labels.null_template'));
+            }
+
             return redirect()->route('settings.labels.index')
                 ->with('success', trans('admin/settings/message.update.success'));
         }
diff --git a/app/View/Label.php b/app/View/Label.php
index e3f0ba7248..4faa6ed97e 100644
--- a/app/View/Label.php
+++ b/app/View/Label.php
@@ -7,6 +7,7 @@ use App\Models\Labels\Label as LabelModel;
 use App\Models\Labels\Sheet;
 use Illuminate\Contracts\View\View;
 use Illuminate\Support\Collection;
+use Illuminate\Support\Facades\Log;
 use Illuminate\Support\Facades\Storage;
 use Illuminate\Support\Traits\Macroable;
 use TCPDF;
@@ -39,6 +40,7 @@ class Label implements View
         $assets = $this->data->get('assets');
         $offset = $this->data->get('offset');
 
+
         // If disabled, pass to legacy view
         if ((!$settings->label2_enable)) {
             return view('hardware/labels')
@@ -51,21 +53,22 @@ class Label implements View
         try {
             $template = LabelModel::find($settings->label2_template);
 
-            if ($template === null) {
-                throw new \UnexpectedValueException('Template is null.');
-            }
-
-            $template->validate();
-        } catch (\UnexpectedValueException $e) {
-
-            \Log::error('Validation failed: ' . $e->getMessage());
-
-        } catch (\Throwable $e) {
-
-            \Log::error('An unexpected error occurred: ' . $e->getMessage());
-
+        if ($template === null) {
+            return redirect()->route('settings.labels.index')->with('error', trans('admin/settings/message.labels.null_template'));
         }
 
+        $template->validate();
+    } catch (\UnexpectedValueException $e) {
+
+        \Log::error('Validation failed: ' . $e->getMessage());
+
+    } catch (\Throwable $e) {
+
+        \Log::error('An unexpected error occurred: ' . $e->getMessage());
+
+    }
+
+        $template->validate();
 
         $pdf = new TCPDF(
             $template->getOrientation(),
diff --git a/resources/lang/en-US/admin/settings/message.php b/resources/lang/en-US/admin/settings/message.php
index c91575144e..727b27b021 100644
--- a/resources/lang/en-US/admin/settings/message.php
+++ b/resources/lang/en-US/admin/settings/message.php
@@ -36,6 +36,9 @@ return [
         'testing_authentication' => 'Testing LDAP Authentication...',
         'authentication_success' => 'User authenticated against LDAP successfully!'
     ],
+    'labels' => [
+        'null_template' => 'Label template not found, Please select a template.',
+        ],
     'webhook' => [
         'sending' => 'Sending :app test message...',
         'success' => 'Your :webhook_name Integration works!',
diff --git a/resources/views/settings/labels.blade.php b/resources/views/settings/labels.blade.php
index 4c01c2177d..4e17a77b37 100644
--- a/resources/views/settings/labels.blade.php
+++ b/resources/views/settings/labels.blade.php
@@ -26,7 +26,6 @@
 
     <div class="row">
         <div class="col-sm-10 col-sm-offset-1 col-md-10">
-
             <div class="panel box box-default">
                 <div class="box-header with-border">
                     <h2 class="box-title">
@@ -35,8 +34,6 @@
                     </h2>
                 </div>
                 <div class="box-body">
-
-
                     <div class="col-md-12">
 
                         <!-- New Label Engine -->