diff --git a/app/serializers/doi_serializer.rb b/app/serializers/doi_serializer.rb
index e74824873..63de3e4b2 100644
--- a/app/serializers/doi_serializer.rb
+++ b/app/serializers/doi_serializer.rb
@@ -8,7 +8,7 @@ class DoiSerializer
   attributes :prefix, :suffix, if: Proc.new { |object, params| params && params[:detail] }
 
   belongs_to :client, record_type: :clients
-  has_many :media
+  has_many :media, if: Proc.new { |doi| doi.media_ids }
 
   attribute :xml, if: Proc.new { |object, params| params && params[:detail] } do |object|
     object.xml_encoded
diff --git a/config/initializers/_version.rb b/config/initializers/_version.rb
index 667e56b37..6d902bda7 100644
--- a/config/initializers/_version.rb
+++ b/config/initializers/_version.rb
@@ -1,5 +1,5 @@
 module Lupo
   class Application
-    VERSION = "2.1.6"
+    VERSION = "2.1.7"
   end
 end
\ No newline at end of file