diff --git a/app/controllers/tags_controller.rb b/app/controllers/tags_controller.rb
index 7af2c1932..64f4c5397 100644
--- a/app/controllers/tags_controller.rb
+++ b/app/controllers/tags_controller.rb
@@ -17,7 +17,7 @@ class TagsController < ApplicationController
   def index
     skip_authorization
     @tags_index = true
-    @tags = Tag.where(alias_for: nil).includes(:sponsorship).order(hotness_score: :desc).limit(100)
+    @tags = Tag.where(alias_for: [nil, ""]).includes(:sponsorship).order(hotness_score: :desc).limit(100)
   end
 
   def edit
diff --git a/spec/requests/tags_spec.rb b/spec/requests/tags_spec.rb
index 105fc75fc..83c4868b0 100644
--- a/spec/requests/tags_spec.rb
+++ b/spec/requests/tags_spec.rb
@@ -3,8 +3,11 @@ require "rails_helper"
 RSpec.describe "Tags", type: :request, proper_status: true do
   describe "GET /tags" do
     it "returns proper page" do
+      create(:tag, name: "ruby")
+      create(:tag, name: "javascript", alias_for: "")
+
       get tags_path
-      expect(response.body).to include("Top tags")
+      expect(response.body).to include("Top tags", "ruby", "javascript")
     end
 
     it "does not include tags with alias" do