diff --git a/invenio_theme_tugraz/assets/semantic-ui/js/invenio_theme_tugraz/deposit/DoiMint.js b/invenio_theme_tugraz/assets/semantic-ui/js/invenio_theme_tugraz/deposit/DoiMint.js
index 8f3d579..8073f27 100644
--- a/invenio_theme_tugraz/assets/semantic-ui/js/invenio_theme_tugraz/deposit/DoiMint.js
+++ b/invenio_theme_tugraz/assets/semantic-ui/js/invenio_theme_tugraz/deposit/DoiMint.js
@@ -29,8 +29,12 @@ export class DoiMint extends Component {
       this.metadata.identifiers.length > 0 &&
       this.metadata.identifiers[0] != null
     ) {
-      this.is_doi = true;
-      this.id_doi = this.metadata.identifiers[0].identifier;
+      for(var identifier of this.metadata.identifiers){
+        if (identifier.scheme == "doi"){
+          this.is_doi = true;
+          this.id_doi = identifier.identifier;
+        }
+      }
     }
 
     // add metadata to the state
diff --git a/invenio_theme_tugraz/templates/invenio_theme_tugraz/landingpage/doi.html b/invenio_theme_tugraz/templates/invenio_theme_tugraz/landingpage/doi.html
index a8a32e0..16aef0b 100644
--- a/invenio_theme_tugraz/templates/invenio_theme_tugraz/landingpage/doi.html
+++ b/invenio_theme_tugraz/templates/invenio_theme_tugraz/landingpage/doi.html
@@ -7,7 +7,11 @@
   #}
   
   {% if metadata.identifiers %}
-  {%- set id_doi = metadata.identifiers[0].identifier %}
+  {% for identifier in metadata.identifiers %}
+  {% if identifier.scheme == 'doi' %}
+
+  
+  {%- set id_doi = identifier.identifier %}
   <dd>
   {% if id_doi %}
     <span class="get-badge" data-toggle="tooltip" data-placement="bottom" style="cursor: pointer;"
@@ -34,3 +38,6 @@
   {% endif %}
   </dd>
   {% endif %}
+{% endfor %}
+
+  {% endif %}