diff --git a/app/models/wiki_content.rb b/app/models/wiki_content.rb
index 88bf4504..b04ad378 100644
--- a/app/models/wiki_content.rb
+++ b/app/models/wiki_content.rb
@@ -104,7 +104,12 @@ class WikiContent < ActiveRecord::Base
     def text
       @text ||= case changes["compression"]
       when "gzip"
-         Zlib::Inflate.inflate(changes["data"])
+        data = Zlib::Inflate.inflate(changes["data"])
+        if data.respond_to? :force_encoding
+          data.force_encoding("UTF-8")
+        else
+          data
+        end
       else
         # uncompressed data
         changes["data"]