diff --git a/app/controllers/registrant/whois_controller.rb b/app/controllers/registrant/whois_controller.rb
deleted file mode 100644
index 2936477eb..000000000
--- a/app/controllers/registrant/whois_controller.rb
+++ /dev/null
@@ -1,11 +0,0 @@
-# As non-GDPR compliant, this controller is deprecated. Needs to be replaced with one that relies
-# on the REST WHOIS API.
-class Registrant::WhoisController < RegistrantController
-  def index
-    authorize! :view, :registrant_whois
-
-    if params[:domain_name].present?
-      @domain = WhoisRecord.find_by(name: params[:domain_name]);
-    end
-  end
-end
diff --git a/app/views/layouts/registrant/application.html.erb b/app/views/layouts/registrant/application.html.erb
index f38f8fcea..f8108d0e0 100644
--- a/app/views/layouts/registrant/application.html.erb
+++ b/app/views/layouts/registrant/application.html.erb
@@ -42,14 +42,16 @@
             <ul class="nav navbar-nav public-nav">
               <% if can? :view, Depp::Domain %>
                 <% active_class = %w(registrant/domains registrant/check registrant/renew registrant/tranfer registrant/keyrelays).include?(params[:controller]) ? 'active' :nil %>
-                <li class="<%= active_class %>">
-                  <%= link_to t(:domains), registrant_domains_path %>
-                </li>
+                  <li class="<%= active_class %>">
+                      <%= link_to t(:domains), registrant_domains_path %>
+                  </li>
+                  <li class="<%= active_class %>">
+                      <%= link_to 'WHOIS', 'https://whois.internet.ee' %>
+                  </li>
+                  <li class="<%= active_class %>">
+                      <%= link_to 'Internet.ee', 'https://internet.ee' %>
+                  </li>
               <% end %>
-              <% active_class = %w(registrant/whois).include?(params[:controller]) ? 'active' :nil %>
-              <li class="<%= active_class %>">
-                <%= link_to 'Internet.ee', 'https://internet.ee' %>
-              </li>
             </ul>
             <ul class="nav navbar-nav navbar-right">
               <% if user_signed_in? %>
diff --git a/test/integration/registrant/layout_test.rb b/test/integration/registrant/layout_test.rb
index 82b8026b7..deabaee20 100644
--- a/test/integration/registrant/layout_test.rb
+++ b/test/integration/registrant/layout_test.rb
@@ -9,9 +9,10 @@ class RegistrantLayoutTest < ActionDispatch::IntegrationTest
     travel_to Time.zone.parse('2010-07-05')
   end
 
-  def test_has_link_to_rest_whois
+  def test_has_link_to_rest_whois_and_internet_ee
     visit registrant_domains_url
+
     assert(has_link?('Internet.ee', href: 'https://internet.ee'))
-    refute(has_link?('WHOIS', href: 'registrant/whois'))
+    assert(has_link?('WHOIS', href: 'https://whois.internet.ee'))
   end
 end