diff --git a/app/Http/Livewire/SlackSettingsForm.php b/app/Http/Livewire/SlackSettingsForm.php
index 5c35454a70..1fda9a118c 100644
--- a/app/Http/Livewire/SlackSettingsForm.php
+++ b/app/Http/Livewire/SlackSettingsForm.php
@@ -11,6 +11,7 @@ class SlackSettingsForm extends Component
     public $slack_endpoint;
     public $slack_channel;
     public $slack_botname;
+    public $isDisabled ='disabled' ;
 
     public Setting $setting;
 
@@ -35,6 +36,9 @@ class SlackSettingsForm extends Component
 
     public function render()
     {
+        if(empty($this->slack_channel || $this->slack_endpoint)){
+            $this->isDisabled= 'disabled';
+        }
         return view('livewire.slack-settings-form');
     }
 
@@ -57,9 +61,11 @@ class SlackSettingsForm extends Component
 
         try {
             $slack->post($this->slack_endpoint, ['body' => $payload]);
+            $this->isDisabled='';
             return session()->flash('success' , 'Your Slack Integration works!');
 
         } catch (\Exception $e) {
+            $this->isDisabled= 'disabled';
             return session()->flash('error' , trans('admin/settings/message.slack.error', ['error_message' => $e->getMessage()]));
         }
 
diff --git a/resources/views/livewire/slack-settings-form.blade.php b/resources/views/livewire/slack-settings-form.blade.php
index ca4ccc527d..416658a8c1 100644
--- a/resources/views/livewire/slack-settings-form.blade.php
+++ b/resources/views/livewire/slack-settings-form.blade.php
@@ -64,7 +64,7 @@
             <div class="col-md-2">
                 {{ Form::label('slack_botname', trans('admin/settings/general.slack_botname')) }}
             </div>
-            <div class="col-md-8 required">
+            <div class="col-md-8">
                 @if (config('app.lock_passwords')===true)
                     <input type="text" wire:model.lazy="slack_botname" class= 'form-control' placeholder="Snipe-Bot" {{old('slack_botname', $slack_botname)}}>
                     <p class="text-warning"><i class="fas fa-lock"></i> {{ trans('general.feature_disabled') }}</p>
@@ -89,7 +89,7 @@
         <div class="box-footer" style="margin-top: 45px;">
             <div class="text-right col-md-12">
                 <a class="btn btn-link text-left" href="{{ route('settings.index') }}">{{ trans('button.cancel') }}</a>
-                <button type="submit" class="btn btn-primary"><i class="fas fa-check icon-white" aria-hidden="true"></i> {{ trans('general.save') }}</button>
+                <button type="submit" {{$isDisabled}} class="btn btn-primary"><i class="fas fa-check icon-white" aria-hidden="true"></i> {{ trans('general.save') }}</button>
             </div>
         </div><!--box-footer-->
         </form>