diff --git a/app/controllers/artists_controller.rb b/app/controllers/artists_controller.rb
index a85c7d992..986250c29 100644
--- a/app/controllers/artists_controller.rb
+++ b/app/controllers/artists_controller.rb
@@ -3,13 +3,11 @@ class ArtistsController < ApplicationController
 
   def new
     @artist = authorize Artist.new_with_defaults(permitted_attributes(Artist))
-    @artist.build_wiki_page if @artist.wiki_page.nil?
     respond_with(@artist)
   end
 
   def edit
     @artist = authorize Artist.find(params[:id])
-    @artist.build_wiki_page if @artist.wiki_page.nil?
     respond_with(@artist)
   end
 
diff --git a/app/models/artist.rb b/app/models/artist.rb
index 8e8608d0d..06b0c1af1 100644
--- a/app/models/artist.rb
+++ b/app/models/artist.rb
@@ -19,8 +19,6 @@ class Artist < ApplicationRecord
   has_one :tag_alias, :foreign_key => "antecedent_name", :primary_key => "name"
   belongs_to :tag, foreign_key: "name", primary_key: "name", default: -> { Tag.new(name: name, category: Tag.categories.artist) }
 
-  accepts_nested_attributes_for :wiki_page, update_only: true, reject_if: :all_blank
-
   scope :banned, -> { where(is_banned: true) }
   scope :unbanned, -> { where(is_banned: false) }
 
diff --git a/app/policies/artist_policy.rb b/app/policies/artist_policy.rb
index ded6d7a6c..1cd5dc2f6 100644
--- a/app/policies/artist_policy.rb
+++ b/app/policies/artist_policy.rb
@@ -12,7 +12,7 @@ class ArtistPolicy < ApplicationPolicy
   end
 
   def permitted_attributes
-    [:name, :other_names, :other_names_string, :group_name, :url_string, :is_deleted, { wiki_page_attributes: [:id, :body] }]
+    [:name, :other_names, :other_names_string, :group_name, :url_string, :is_deleted]
   end
 
   def permitted_attributes_for_new
diff --git a/app/views/artists/_form.html.erb b/app/views/artists/_form.html.erb
index cb4990b63..d4a200708 100644
--- a/app/views/artists/_form.html.erb
+++ b/app/views/artists/_form.html.erb
@@ -5,8 +5,14 @@
   <%= f.input :group_name %>
   <%= f.input :url_string, :label => "URLs", :as => :text, :input_html => {:size => "50x15", :value => params.dig(:artist, :url_string) || @artist.urls.join("\n")}, :hint => "You can prefix a URL with - to mark it as dead." %>
 
-  <%= f.simple_fields_for :wiki_page do |fw| %>
-    <%= fw.input :body, label: "Wiki", input_html: { size: "50x15" } %>
+  <% if @artist.wiki_page.present? %>
+    <div class="input">
+      <label>Wiki (<%= link_to "Edit", edit_wiki_page_path(@artist.wiki_page) %>)</label>
+    </div>
+
+    <div class="prose">
+      <%= format_text(@artist.wiki_page.body, disable_mentions: true) %>
+    </div>
   <% end %>
 
   <%= f.button :submit, "Submit" %>
diff --git a/test/functional/artists_controller_test.rb b/test/functional/artists_controller_test.rb
index 97697622b..bba9db451 100644
--- a/test/functional/artists_controller_test.rb
+++ b/test/functional/artists_controller_test.rb
@@ -161,37 +161,6 @@ class ArtistsControllerTest < ActionDispatch::IntegrationTest
       end
     end
 
-    context "with an artist that has a wiki page" do
-      setup do
-        as(@admin) do
-          @artist = create(:artist, name: "aaa", url_string: "http://example.com")
-          @wiki_page = create(:wiki_page, title: "aaa", body: "testing")
-        end
-        @another_user = create(:user)
-      end
-
-      should "update the wiki with the artist" do
-        old_timestamp = @wiki_page.updated_at
-        travel(1.minute) do
-          put_auth artist_path(@artist.id), @user, params: {artist: { wiki_page_attributes: { body: "rex" }, url_string: "http://example.com\nhttp://monet.com"}}
-        end
-        @artist.reload
-        @wiki_page = @artist.wiki_page
-        assert_equal("rex", @artist.wiki_page.body)
-        assert_not_equal(old_timestamp, @wiki_page.updated_at)
-        assert_redirected_to(artist_path(@artist.id))
-      end
-
-      should "not touch the updated_at fields when nothing is changed" do
-        old_timestamp = @wiki_page.updated_at
-
-        travel(1.minute)
-        as(@another_user) { @artist.update(wiki_page_attributes: { body: "testing" }) }
-
-        assert_equal(old_timestamp.to_i, @artist.reload.wiki_page.updated_at.to_i)
-      end
-    end
-
     context "destroy action" do
       should "delete an artist" do
         delete_auth artist_path(@artist.id), create(:builder_user)