diff --git a/lib/web/fetch/index.js b/lib/web/fetch/index.js
index afd515447da..79991224617 100644
--- a/lib/web/fetch/index.js
+++ b/lib/web/fetch/index.js
@@ -128,7 +128,6 @@ function handleFetchDone (response) {
 // This will publish all diagnostic events only when we have subscribers.
 function ifSubscribersRunStores (req, input, init, callback) {
   const hasSubscribers = subscribersCheck()
-  // console.log(arguments)
 
   if (hasSubscribers) {
     const context = { req, input, init, result: null, error: null }
@@ -426,7 +425,6 @@ function fetching ({
   useParallelQueue = false,
   dispatcher = getGlobalDispatcher() // undici
 }) {
-  console.log('request', request)
   // Ensure that the dispatcher is set accordingly
   assert(dispatcher)
 
@@ -501,9 +499,9 @@ function fetching ({
 
   // 9. If request’s origin is "client", then set request’s origin to request’s
   // client’s origin.
-  console.log('reqyest', request)
   if (request.origin === 'client') {
-    request.origin = request.client.origin
+    // TODO: What if request.client is null?
+    request.origin = request.client?.origin
   }
 
   // 10. If all of the following conditions are true: