diff --git a/modules/media/ajax/FileUpload.php b/modules/media/ajax/FileUpload.php
index 49f799a3964..26e05363ebf 100644
--- a/modules/media/ajax/FileUpload.php
+++ b/modules/media/ajax/FileUpload.php
@@ -205,8 +205,9 @@ function viewData()
 function getUploadFields()
 {
 
-    $db   = \NDB_Factory::singleton()->database();
-    $user = \User::singleton();
+    $db     = \NDB_Factory::singleton()->database();
+    $user   = \User::singleton();
+    $config = \NDB_Config::singleton();
 
     // Select only candidates that have had visit at user's sites
     $qparam       = array();
@@ -231,6 +232,8 @@ function getUploadFields()
     $visitList       = Utility::getVisitList();
     $siteList        = Utility::getSiteList(false);
     $languageList    = Utility::getLanguageList();
+    $startYear       = $config->getSetting('startYear');
+    $endYear         = $config->getSetting('endYear');
 
     // Build array of session data to be used in upload media dropdowns
     $sessionData = array();
@@ -328,6 +331,8 @@ function getUploadFields()
                'mediaFiles'  => array_values(getFilesList()),
                'sessionData' => $sessionData,
                'language'    => $languageList,
+               'startYear'   => $startYear,
+               'endYear'     => $endYear,
               ];
 
     return $result;
diff --git a/modules/media/jsx/uploadForm.js b/modules/media/jsx/uploadForm.js
index c94bdd32e76..83e8b617adf 100644
--- a/modules/media/jsx/uploadForm.js
+++ b/modules/media/jsx/uploadForm.js
@@ -138,8 +138,8 @@ class MediaUploadForm extends Component {
             <DateElement
               name='dateTaken'
               label='Date of Administration'
-              minYear='2000'
-              maxYear='2017'
+              minYear={this.state.Data.startYear}
+              maxYear={this.state.Data.endYear}
               onUserInput={this.setFormData}
               ref='dateTaken'
               value={this.state.formData.dateTaken}