diff --git a/app/controllers/BlogController.php b/app/controllers/BlogController.php
index a59e650..fc0d0b4 100644
--- a/app/controllers/BlogController.php
+++ b/app/controllers/BlogController.php
@@ -54,9 +54,20 @@ class BlogController extends PageController {
 			return "<u class=\"text-decoration-none text-reset\" title=\"{$timestamp}\">{$date}</u>";
 		};
 
-		$this->router->service()->tags = function (string $tags): array {
+		$this->router->service()->tags = function (string $tags): string {
+			$result = "";
+
 			// Remove empty elements via array_filter()
-			return array_filter(explode(':', $tags));
+			$splitTags = array_filter(explode(':', $tags), function ($tag) {
+				return !empty(trim($tag));
+			});
+
+			foreach ($splitTags as $key => $tag) {
+				$result .= $tag;
+				$result .= (($key === array_key_last($splitTags)) ? '' : ', ');
+			}
+
+			return $result;
 		};
 	}
 
diff --git a/app/views/partials/blog-posts.php b/app/views/partials/blog-posts.php
index 9654423..97ca0d0 100644
--- a/app/views/partials/blog-posts.php
+++ b/app/views/partials/blog-posts.php
@@ -15,13 +15,7 @@
 						</p>
 	<?php if (_exists($post, 'tag')) { ?>
 						<small>
-							<i>
-								tags:
-		<?php $tags = ($this->tags)($post['tag']); ?>
-		<?php foreach ($tags as $key => $tag) { ?>
-			<?= $tag . (($key === array_key_last($tags)) ? '' : ', '); ?>
-		<?php } ?>
-							</i>
+							<i>tags: <?= ($this->tags)($post['tag']); ?></i>
 						</small>
 						<div class="d-md-none mb-3"></div>
 	<?php } ?>