diff --git a/_plugins/category_filter.rb b/_plugins/category_filter.rb
index fb49040..a444c21 100644
--- a/_plugins/category_filter.rb
+++ b/_plugins/category_filter.rb
@@ -3,9 +3,9 @@ module CategoryFilter
     def category_url(category)
       site = @context.registers[:site]
       if site.config["categories_dir"]
-        "#{site.config["url"]}/#{site.config["baseurl"]}/#{site.config["categories_dir"]}/#{category.tr(" ", "-")}/"
+        "#{site.config["url"]}/#{site.config["categories_dir"]}/#{category.tr(" ", "-")}/"
       else
-        "#{site.config["url"]}/#{site.config["baseurl"]}/categories/#{category.tr(" ", "-")}/"
+        "#{site.config["url"]}/categories/#{category.tr(" ", "-")}/"
       end.gsub(/\/\/+/).with_index { |_, i| i.zero? ? "//" : "/" }
     end
   end
diff --git a/_plugins/tag_filter.rb b/_plugins/tag_filter.rb
index c65ef68..dd1900a 100644
--- a/_plugins/tag_filter.rb
+++ b/_plugins/tag_filter.rb
@@ -3,9 +3,9 @@ module TagFilter
     def tag_url(tag)
       site = @context.registers[:site]
       if site.config["tags_dir"]
-        "#{site.config["url"]}/#{site.config["baseurl"]}/#{site.config["tags_dir"]}/#{tag.tr(" ", "-")}/"
+        "#{site.config["url"]}/#{site.config["tags_dir"]}/#{tag.tr(" ", "-")}/"
       else
-        "#{site.config["url"]}/#{site.config["baseurl"]}/tags/#{tag.tr(" ", "-")}/"
+        "#{site.config["url"]}/tags/#{tag.tr(" ", "-")}/"
       end.gsub(/\/\/+/).with_index { |_, i| i.zero? ? "//" : "/" }
     end
   end