diff --git a/app/Livewire/Storage/Create.php b/app/Livewire/Storage/Create.php
index d1af807d5..1b2510f5d 100644
--- a/app/Livewire/Storage/Create.php
+++ b/app/Livewire/Storage/Create.php
@@ -16,13 +16,13 @@ class Create extends Component
     public string $endpoint;
     public S3Storage $storage;
     protected $rules = [
-        'name' => 'nullable|min:3|max:255',
+        'name' => 'required|min:3|max:255',
         'description' => 'nullable|min:3|max:255',
         'region' => 'required|max:255',
         'key' => 'required|max:255',
         'secret' => 'required|max:255',
         'bucket' => 'required|max:255',
-        'endpoint' => 'nullable|url|max:255',
+        'endpoint' => 'required|url|max:255',
     ];
     protected $validationAttributes = [
         'name' => 'Name',
diff --git a/resources/views/livewire/storage/create.blade.php b/resources/views/livewire/storage/create.blade.php
index 016a6a1b2..a3ccde461 100644
--- a/resources/views/livewire/storage/create.blade.php
+++ b/resources/views/livewire/storage/create.blade.php
@@ -2,11 +2,11 @@
     <div class="subtitle">S3 Storage used to save backups / files.</div>
     <form class="flex flex-col gap-2" wire:submit='submit'>
         <div class="flex gap-2">
-            <x-forms.input label="Name" id="name" />
+            <x-forms.input required label="Name" id="name" />
             <x-forms.input label="Description" id="description" />
         </div>
         <div class="flex gap-2">
-            <x-forms.input type="url" label="Endpoint" id="endpoint" />
+            <x-forms.input required type="url" label="Endpoint" id="endpoint" />
             <x-forms.input required label="Bucket" id="bucket" />
             <x-forms.input required label="Region" id="region" />
         </div>