diff --git a/lib/outputrenderers.php b/lib/outputrenderers.php
index 15aaa8c72b5..3b04d5d992a 100644
--- a/lib/outputrenderers.php
+++ b/lib/outputrenderers.php
@@ -2579,12 +2579,8 @@ class core_renderer extends renderer_base {
         }
 
         // Then wrap it in link if needed. Also we don't wrap it in link if the link redirects to itself.
-        // It might not return page url in unit test.
-        if (PHPUNIT_TEST) {
-            if (!$userpicture->link ) {
-                return $output;
-            }
-        } else if (!$userpicture->link || $this->page->url == $url) {
+        if (!$userpicture->link ||
+                ($this->page->has_set_url() && $this->page->url == $url)) { // Protect against unset page->url.
             return $output;
         }