diff --git a/web/taginfo.rb b/web/taginfo.rb
index d9720636..e2fbbe63 100755
--- a/web/taginfo.rb
+++ b/web/taginfo.rb
@@ -72,6 +72,12 @@ class Taginfo < Sinatra::Base
             set :host, 'localhost'
             set :port, ARGV[0]
             set :environment, :production
+
+            # Disable rack-protection library because it messes up embedding
+            # taginfo in an iframe. This should probably be done more
+            # selectively, but there is no documentation on what rack-protection
+            # is actually doing...
+            disable :protection
         else
             # test
             enable :logging