diff --git a/changes/issue-36935-better-message-error-token b/changes/issue-36935-better-message-error-token
new file mode 100644
index 0000000000..d71f284398
--- /dev/null
+++ b/changes/issue-36935-better-message-error-token
@@ -0,0 +1 @@
+- improve error message where there is issue getting the enrollment token during ota enrollment
diff --git a/frontend/templates/enroll-ota.html b/frontend/templates/enroll-ota.html
index fec9ab8c2c..b05a8828f7 100644
--- a/frontend/templates/enroll-ota.html
+++ b/frontend/templates/enroll-ota.html
@@ -464,8 +464,8 @@
             setEnrollTokenUrl(data.android_enrollment_url);
           } catch (error) {
             renderError(
-              "This URL is invalid.",
-              "Enroll secret is invalid. Please contact your IT admin."
+              "Couldn't get Android enrollment token.",
+              "Please refresh the page. If the issue continues, contact your IT admin."
             );
             return;
           }