diff --git a/changedetectionio/blueprint/ui/edit.py b/changedetectionio/blueprint/ui/edit.py
index bd0e62a08..e7325b72e 100644
--- a/changedetectionio/blueprint/ui/edit.py
+++ b/changedetectionio/blueprint/ui/edit.py
@@ -364,9 +364,6 @@ def construct_blueprint(datastore: ChangeDetectionStore, update_q, queuedWatchMe
         from pathlib import Path
         import datetime
 
-        if uuid == 'first':
-            uuid = list(datastore.data['watching'].keys()).pop()
-
         watch = datastore.data['watching'].get(uuid)
         if not watch:
             abort(404)
diff --git a/changedetectionio/blueprint/ui/templates/edit.html b/changedetectionio/blueprint/ui/templates/edit.html
index edc250ef3..45ea60e26 100644
--- a/changedetectionio/blueprint/ui/templates/edit.html
+++ b/changedetectionio/blueprint/ui/templates/edit.html
@@ -488,7 +488,7 @@ Math: {{ 1 + 1 }}") }}
                     {% if watch.history_n %}
                         <p>
                              <a href="{{url_for('ui.ui_edit.watch_get_latest_html', uuid=uuid)}}" class="pure-button button-small">{{ _('Download latest HTML snapshot') }}</a>
-                             <a href="{{url_for('ui.ui_edit.watch_get_data_package', uuid=uuid)}}" class="pure-button button-small">{{ _('Export watch data') }}</a>
+                             <a href="{{url_for('ui.ui_edit.watch_get_data_package', uuid=uuid)}}" class="pure-button button-small">{{ _('Download watch data package') }}</a>
                         </p>
                     {% endif %}
 
diff --git a/changedetectionio/tests/test_backup.py b/changedetectionio/tests/test_backup.py
index 45d2578ed..7ae008671 100644
--- a/changedetectionio/tests/test_backup.py
+++ b/changedetectionio/tests/test_backup.py
@@ -107,10 +107,7 @@ def test_watch_data_package_download(client, live_server, measure_memory_usage,
     assert uuid is not None, "Could not find watch UUID in datastore"
 
     # Download the watch data package
-    res = client.get(
-        url_for("ui.ui_edit.watch_get_data_package", uuid=uuid),
-        follow_redirects=True
-    )
+    res = client.get(url_for("ui.ui_edit.watch_get_data_package", uuid=uuid))
 
     # Should get the right zip content type
     assert res.content_type == "application/zip"