diff --git a/resources/views/reports/custom.blade.php b/resources/views/reports/custom.blade.php
index 6aa91e32b2..e85271f8cd 100644
--- a/resources/views/reports/custom.blade.php
+++ b/resources/views/reports/custom.blade.php
@@ -276,9 +276,9 @@
             <div class="form-group purchase-range">
               <label for="created_start" class="col-md-3 control-label">{{ trans('general.created_at') }} {{  trans('general.range') }}</label>
               <div class="input-daterange input-group col-md-6" id="datepicker">
-                <input type="text" class="form-control" name="created_start" aria-label="created_start">
+                <input type="text" class="form-control" name="created_start" aria-label="created_start" value="{{ $savedReport->textValue('created_start') }}">
                 <span class="input-group-addon">to</span>
-                <input type="text" class="form-control" name="created_end" aria-label="created_end">
+                <input type="text" class="form-control" name="created_end" aria-label="created_end" value="{{ $savedReport->textValue('created_end') }}">
               </div>
             </div>
 
@@ -286,9 +286,9 @@
           <div class="form-group checkout-range">
               <label for="checkout_date" class="col-md-3 control-label">{{ trans('general.checkout') }} {{  trans('general.range') }}</label>
               <div class="input-daterange input-group col-md-6" id="datepicker">
-                  <input type="text" class="form-control" name="checkout_date_start" aria-label="checkout_date_start">
+                  <input type="text" class="form-control" name="checkout_date_start" aria-label="checkout_date_start" value="{{ $savedReport->textValue('checkout_date_start') }}">
                   <span class="input-group-addon">to</span>
-                  <input type="text" class="form-control" name="checkout_date_end" aria-label="checkout_date_end">
+                  <input type="text" class="form-control" name="checkout_date_end" aria-label="checkout_date_end" value="{{ $savedReport->textValue('checkout_date_end') }}">
               </div>
           </div>
 
@@ -296,9 +296,9 @@
             <div class="form-group expected_checkin-range">
               <label for="expected_checkin_start" class="col-md-3 control-label">{{ trans('admin/hardware/form.expected_checkin') }}</label>
               <div class="input-daterange input-group col-md-6" id="datepicker">
-                <input type="text" class="form-control" name="expected_checkin_start" aria-label="expected_checkin_start">
+                <input type="text" class="form-control" name="expected_checkin_start" aria-label="expected_checkin_start" value="{{ $savedReport->textValue('expected_checkin_start') }}">
                 <span class="input-group-addon">to</span>
-                <input type="text" class="form-control" name="expected_checkin_end" aria-label="expected_checkin_end">
+                <input type="text" class="form-control" name="expected_checkin_end" aria-label="expected_checkin_end" value="{{ $savedReport->textValue('expected_checkin_end') }}">
               </div>
             </div>
 
@@ -306,9 +306,9 @@
               <div class="form-group last_audit-range">
                   <label for="last_audit_start" class="col-md-3 control-label">{{ trans('general.last_audit') }}</label>
                   <div class="input-daterange input-group col-md-6" id="datepicker">
-                      <input type="text" class="form-control" name="last_audit_start" aria-label="last_audit_start">
+                      <input type="text" class="form-control" name="last_audit_start" aria-label="last_audit_start" value="{{ $savedReport->textValue('last_audit_start') }}">
                       <span class="input-group-addon">to</span>
-                      <input type="text" class="form-control" name="last_audit_end" aria-label="last_audit_end">
+                      <input type="text" class="form-control" name="last_audit_end" aria-label="last_audit_end" value="{{ $savedReport->textValue('last_audit_end') }}">
                   </div>
               </div>
 
@@ -316,9 +316,9 @@
               <div class="form-group next_audit-range">
                   <label for="next_audit_start" class="col-md-3 control-label">{{ trans('general.next_audit_date') }}</label>
                   <div class="input-daterange input-group col-md-6" id="datepicker">
-                      <input type="text" class="form-control" name="next_audit_start" aria-label="nex_audit_start">
+                      <input type="text" class="form-control" name="next_audit_start" aria-label="nex_audit_start" value="{{ $savedReport->textValue('next_audit_start') }}">
                       <span class="input-group-addon">to</span>
-                      <input type="text" class="form-control" name="next_audit_end" aria-label="next_audit_end">
+                      <input type="text" class="form-control" name="next_audit_end" aria-label="next_audit_end" value="{{ $savedReport->textValue('next_audit_end') }}">
                   </div>
               </div>
 
diff --git a/tests/Unit/SavedReportTest.php b/tests/Unit/SavedReportTest.php
index b5361cfdb7..2947667081 100644
--- a/tests/Unit/SavedReportTest.php
+++ b/tests/Unit/SavedReportTest.php
@@ -83,4 +83,16 @@ class SavedReportTest extends TestCase
     {
         $this->markTestIncomplete();
     }
+
+    public function testDateRangesAreNotStored()
+    {
+        $this->markTestIncomplete();
+
+        // This might not be a test we implement, but it's a place to ask a question:
+        // Should we be saving and restoring date ranges?
+        // A use-case I can see is running a report at the end of the month for the date ranges for that month.
+        // Maybe it's better to leave those off so users are gently prompted to enter the ranges for each run?
+        // Another option would be to have checkbox that asks the user if they would like to save the dates?
+        // I'm not sure how helpful that is, and it would probably be a future feature if implemented.
+    }
 }