diff --git a/controllers/ViewPhotoAlbum.php b/controllers/ViewPhotoAlbum.php
index b74006f..5e99697 100644
--- a/controllers/ViewPhotoAlbum.php
+++ b/controllers/ViewPhotoAlbum.php
@@ -74,7 +74,7 @@ class ViewPhotoAlbum extends HTMLController
 				'recordCount' => $total_count,
 				'items_per_page' => self::PER_PAGE,
 				'start' => (isset($_GET['page']) ? $_GET['page'] - 1 : 0) * self::PER_PAGE,
-				'base_url' => BASEURL . '/' . (isset($_GET['tag']) ? $_GET['tag'] . '/' : ''),
+				'base_url' => $tag->getUrl(),
 				'page_slug' => 'page/%PAGE%/',
 				'index_class' => 'pagination-lg justify-content-around justify-content-lg-center',
 			]);
@@ -82,8 +82,7 @@ class ViewPhotoAlbum extends HTMLController
 		}
 
 		// Set the canonical url.
-		$this->page->setCanonicalUrl(BASEURL . '/' . (isset($_GET['tag']) ? $_GET['tag'] . '/' : '') .
-			($page > 1 ? 'page/' . $page . '/' : ''));
+		$this->page->setCanonicalUrl($tag->getUrl() . ($page > 1 ? 'page/' . $page . '/' : ''));
 	}
 
 	public function getPhotoMosaic($id_tag, $page, $sort_linear)