diff --git a/CitationStyleLanguagePlugin.php b/CitationStyleLanguagePlugin.php
index 618efc2..5caa671 100644
--- a/CitationStyleLanguagePlugin.php
+++ b/CitationStyleLanguagePlugin.php
@@ -581,7 +581,15 @@ public function getCitation(PKPRequest $request, Submission $submission, string
                     $additionalMarkup = [
                         'DOI' => [
                             'function' => function ($item, $renderedValue) {
-                                return '<a href="https://doi.org/' . $item->DOI . '">' . $renderedValue . '</a>';
+                                $doiWithUrl = 'https://doi.org/'.$item->DOI;
+                                if (str_contains($renderedValue, $doiWithUrl)) {
+                                    $doiLink = '<a href="' . $doiWithUrl . '">' . $doiWithUrl . '</a>';
+                                    return str_replace($doiWithUrl, $doiLink, $renderedValue);
+                                } else {
+                                    $doiLink = '<a href="' . $doiWithUrl . '">' . $item->DOI . '</a>';
+                                    return str_replace($item->DOI, $doiLink, $renderedValue);
+
+                                }
                             },
                             'affixes' => true
                         ],
@@ -589,7 +597,7 @@ public function getCitation(PKPRequest $request, Submission $submission, string
                             'function' => function ($item, $renderedValue) {
                                 return '<a href="' . $item->URL . '">' . $renderedValue . '</a>';
                             },
-                            'affixes' => true
+                            'affixes' => false
                         ],
                     ];