diff --git a/.changesets/10231.md b/.changesets/10231.md
new file mode 100644
index 000000000000..55b3ce50a666
--- /dev/null
+++ b/.changesets/10231.md
@@ -0,0 +1,3 @@
+- Added warning note to not add WebAuthn (#10231) by @pantheredeye
+
+Adds a warning to the tutorial telling users not to add WebAuthn as it's not supported by the generated login pages the tutorial uses.
diff --git a/docs/docs/tutorial/chapter4/authentication.md b/docs/docs/tutorial/chapter4/authentication.md
index c42b3fb7d393..9d52ef42e1a8 100644
--- a/docs/docs/tutorial/chapter4/authentication.md
+++ b/docs/docs/tutorial/chapter4/authentication.md
@@ -473,6 +473,11 @@ Yet another generator is here for you, this time one that will create pages for
 ```bash
 yarn rw g dbAuth
 ```
+:::warning
+
+In the dbAuth setup steps you will see the option for "Querying WebAuthn addition..." For now, either press enter to keep the default as 'false' or type 'no'. WebAuthn works, and is great, but we do not want to add it as part of the tutorial.  
+
+:::
 
 Again several pages will be created and some post-install instructions will describe next steps. But for now, try going to [http://localhost:8910/login](http://localhost:8910/login):
 
diff --git a/docs/versioned_docs/version-6.x/tutorial/chapter4/authentication.md b/docs/versioned_docs/version-6.x/tutorial/chapter4/authentication.md
index c42b3fb7d393..9d52ef42e1a8 100644
--- a/docs/versioned_docs/version-6.x/tutorial/chapter4/authentication.md
+++ b/docs/versioned_docs/version-6.x/tutorial/chapter4/authentication.md
@@ -473,6 +473,11 @@ Yet another generator is here for you, this time one that will create pages for
 ```bash
 yarn rw g dbAuth
 ```
+:::warning
+
+In the dbAuth setup steps you will see the option for "Querying WebAuthn addition..." For now, either press enter to keep the default as 'false' or type 'no'. WebAuthn works, and is great, but we do not want to add it as part of the tutorial.  
+
+:::
 
 Again several pages will be created and some post-install instructions will describe next steps. But for now, try going to [http://localhost:8910/login](http://localhost:8910/login):
 
diff --git a/docs/versioned_docs/version-7.0/tutorial/chapter4/authentication.md b/docs/versioned_docs/version-7.0/tutorial/chapter4/authentication.md
index c42b3fb7d393..9d52ef42e1a8 100644
--- a/docs/versioned_docs/version-7.0/tutorial/chapter4/authentication.md
+++ b/docs/versioned_docs/version-7.0/tutorial/chapter4/authentication.md
@@ -473,6 +473,11 @@ Yet another generator is here for you, this time one that will create pages for
 ```bash
 yarn rw g dbAuth
 ```
+:::warning
+
+In the dbAuth setup steps you will see the option for "Querying WebAuthn addition..." For now, either press enter to keep the default as 'false' or type 'no'. WebAuthn works, and is great, but we do not want to add it as part of the tutorial.  
+
+:::
 
 Again several pages will be created and some post-install instructions will describe next steps. But for now, try going to [http://localhost:8910/login](http://localhost:8910/login):