diff --git a/resources/views/hardware/checkin.blade.php b/resources/views/hardware/checkin.blade.php
index 1b1950c594..ce63d6e723 100755
--- a/resources/views/hardware/checkin.blade.php
+++ b/resources/views/hardware/checkin.blade.php
@@ -113,17 +113,25 @@
                                             </div>
                                         </div>
 
-                                        <!-- Note -->
-                                        <div class="form-group {{ $errors->has('note') ? 'error' : '' }}">
-                                            <label for="note" class="col-sm-3 control-label">
-                                                {{ trans('general.notes') }}
-                                            </label>
-                                            <div class="col-md-8">
-                                                <textarea class="col-md-6 form-control" id="note" required="true"
-                                                          name="note">{{ old('note', $asset->note) }}</textarea>
-                                                {!! $errors->first('note', '<span class="alert-msg" aria-hidden="true"><i class="fas fa-times" aria-hidden="true"></i> :message</span>') !!}
-                                            </div>
-                                        </div>
+                        <!-- Note -->
+                        <div class="form-group {{ $errors->has('note') ? 'error' : '' }}">
+                            <label for="note" class="col-md-3 control-label">
+                                {{ trans('general.notes') }}
+                            </label>
+                            @if($snipeSettings->require_checkinout_notes=="1")
+                            <div class="col-md-8">
+                                <textarea class="col-md-6 form-control" id="note" required="true"
+                                        name="note">{{ old('note', $asset->note) }}</textarea>
+                                {!! $errors->first('note', '<span class="alert-msg" aria-hidden="true"><i class="fas fa-times" aria-hidden="true"></i> :message</span>') !!}
+                            </div>
+                            @else
+                            <div class="col-md-8">
+                                <textarea class="col-md-6 form-control" id="note"
+                                        name="note">{{ old('note', $asset->note) }}</textarea>
+                                {!! $errors->first('note', '<span class="alert-msg" aria-hidden="true"><i class="fas fa-times" aria-hidden="true"></i> :message</span>') !!}
+                            </div>
+                            @endif
+                        </div>
                     </div> <!--/.box-body-->
                 </div> <!--/.box-body-->
 
diff --git a/resources/views/hardware/checkout.blade.php b/resources/views/hardware/checkout.blade.php
index 22e1dc00a4..fadb7a1abc 100755
--- a/resources/views/hardware/checkout.blade.php
+++ b/resources/views/hardware/checkout.blade.php
@@ -141,11 +141,19 @@
                             <label for="note" class="col-md-3 control-label">
                                 {{ trans('general.notes') }}
                             </label>
+                            @if($snipeSettings->require_checkinout_notes=="1")
                             <div class="col-md-8">
                                 <textarea class="col-md-6 form-control" id="note" required="true"
                                           name="note">{{ old('note', $asset->note) }}</textarea>
                                 {!! $errors->first('note', '<span class="alert-msg" aria-hidden="true"><i class="fas fa-times" aria-hidden="true"></i> :message</span>') !!}
                             </div>
+                            @else
+                            <div class="col-md-8">
+                                <textarea class="col-md-6 form-control" id="note"
+                                          name="note">{{ old('note', $asset->note) }}</textarea>
+                                {!! $errors->first('note', '<span class="alert-msg" aria-hidden="true"><i class="fas fa-times" aria-hidden="true"></i> :message</span>') !!}
+                            </div>
+                            @endif
                         </div>
 
                         @if ($asset->requireAcceptance() || $asset->getEula() || ($snipeSettings->webhook_endpoint!=''))