diff --git a/includes/add_datastream.form.inc b/includes/add_datastream.form.inc
index 4484a903..55b45a04 100644
--- a/includes/add_datastream.form.inc
+++ b/includes/add_datastream.form.inc
@@ -71,7 +71,7 @@ function islandora_add_datastream_form(array $form, array &$form_state, Abstract
         '#size' => 48,
         '#description' => t('Select a file to upload.<br/>Files must be less than <strong>@size MB.</strong>', array('@size' => $upload_size)),
         '#default_value' => isset($form_state['values']['files']) ? $form_state['values']['files'] : NULL,
-        '#upload_location' => 'public://',
+        '#upload_location' => file_default_scheme() . '://',
         '#upload_validators' => array(
           // Disable default file_validate_extensions; we need direct control.
           'file_validate_extensions' => array(NULL),
diff --git a/includes/datastream.version.inc b/includes/datastream.version.inc
index a8ecf102..b79b5a80 100644
--- a/includes/datastream.version.inc
+++ b/includes/datastream.version.inc
@@ -305,7 +305,7 @@ function islandora_datastream_version_replace_form($form, &$form_state, Abstract
         '#title' => t('Upload Document'),
         '#size' => 64,
         '#description' => t('Select a file to upload.<br/>Files must be less than <strong>@size MB.</strong>', array('@size' => $upload_size)),
-        '#upload_location' => 'public://',
+        '#upload_location' => file_default_scheme() . '://',
         '#upload_validators' => array(
           'file_validate_extensions' => array($valid_extensions),
           // Assume its specified in MB.