diff --git a/.changeset/grumpy-turtles-vanish.md b/.changeset/grumpy-turtles-vanish.md
new file mode 100644
index 0000000000..ec3733872f
--- /dev/null
+++ b/.changeset/grumpy-turtles-vanish.md
@@ -0,0 +1,5 @@
+---
+'@backstage/plugin-scaffolder-backend': patch
+---
+
+Fix support for unauthenticated requests to create scaffolder tasks
diff --git a/plugins/scaffolder-backend/src/service/router.ts b/plugins/scaffolder-backend/src/service/router.ts
index 18262a4f50..50f6fc372f 100644
--- a/plugins/scaffolder-backend/src/service/router.ts
+++ b/plugins/scaffolder-backend/src/service/router.ts
@@ -461,10 +461,7 @@ export async function createRouter(
         defaultKind: 'template',
       });
 
-      // TODO(blam): This should be forced user auth eventually, but let's keep it as is for now,
-      // with the ability to do unauthenticated task creation.
       const credentials = await httpAuth.credentials(req);
-
       const { token } = await auth.getPluginRequestToken({
         onBehalfOf: credentials,
         targetPluginId: 'catalog',