diff --git a/app/views/pages/show.html.haml b/app/views/pages/show.html.haml
index 889693fb..68a7cdf8 100644
--- a/app/views/pages/show.html.haml
+++ b/app/views/pages/show.html.haml
@@ -27,7 +27,7 @@
           - for version in @page.versions.reverse
             %li
               = link_to I18n.l(version.updated_at, :format => "%d.%m.%y %H:%M"), version_page_path(@page, :version => version.lock_version)
-              = "(#{User.find(version.updated_by).nick})"
+              = "(#{User.find_by_id(version.updated_by).try(:nick)})"
 
     - unless @page.children.empty?
       #subpages{:style => "display:none"}