diff --git a/changelog.html b/changelog.html
index 5308a754b345bd09e86f60ce9425e2e56c8311b4..32d47a8551c3badd99b9d45f3b77d9439da9d84b 100644
--- a/changelog.html
+++ b/changelog.html
@@ -83,6 +83,9 @@ Upcoming changes</a>
     (<a href="https://issues.jenkins-ci.org/browse/JENKINS-21394">issue 21394</a>)
   <li class=rfe>
     Debian package now creates 'jenkins' group
+  <li class=rfe>
+    Suppress fingerprint link if fingerprint record isn't available.
+    (<a href="https://issues.jenkins-ci.org/browse/JENKINS-21818">issue 21818</a>)
 </ul>
 </div><!--=TRUNK-END=-->
 
diff --git a/core/src/main/resources/hudson/model/DirectoryBrowserSupport/dir.jelly b/core/src/main/resources/hudson/model/DirectoryBrowserSupport/dir.jelly
index 72a87bd2405d8f78a8452c8a02b133d18fe94e5c..07baa2d57577a7fbcbc1ad0665e5a73edce1ab04 100644
--- a/core/src/main/resources/hudson/model/DirectoryBrowserSupport/dir.jelly
+++ b/core/src/main/resources/hudson/model/DirectoryBrowserSupport/dir.jelly
@@ -75,10 +75,12 @@ THE SOFTWARE.
                     </td>
                     <td>
                       <j:if test="${x.readable}">
-                        <a href="${x.href}/*fingerprint*/">
-                          <img src="${imagesURL}/16x16/fingerprint.png" alt="fingerprint" height="16" width="16" />
-                        </a>
-                        <st:nbsp/>
+                        <j:if test="${app.fingerprintMap.ready}">
+                          <a href="${x.href}/*fingerprint*/">
+                            <img src="${imagesURL}/16x16/fingerprint.png" alt="fingerprint" height="16" width="16" />
+                          </a>
+                          <st:nbsp/>
+                        </j:if>
                         <a href="${x.href}/*view*/">${%view}</a>
                       </j:if>                      
                     </td>
diff --git a/core/src/main/resources/lib/hudson/artifactList.jelly b/core/src/main/resources/lib/hudson/artifactList.jelly
index 92d6e0041826de7124389dbb02aceba62b70686d..20aae145eaf26a61afd1e60e136f611fc2bb0357 100644
--- a/core/src/main/resources/lib/hudson/artifactList.jelly
+++ b/core/src/main/resources/lib/hudson/artifactList.jelly
@@ -60,10 +60,12 @@ THE SOFTWARE.
                     ${h.humanReadableByteSize(f.getFileSize())}
                   </td>
                   <td>
-                    <a href="${baseURL}artifact/${f.href}/*fingerprint*/">
-                      <img src="${imagesURL}/16x16/fingerprint.png" alt="[fingerprint]" height="16" width="16"/>
-                    </a>
-                    <st:nbsp/>
+                    <j:if test="${app.fingerprintMap.ready}">
+                      <a href="${baseURL}artifact/${f.href}/*fingerprint*/">
+                        <img src="${imagesURL}/16x16/fingerprint.png" alt="[fingerprint]" height="16" width="16"/>
+                      </a>
+                      <st:nbsp/>
+                    </j:if>
                     <a href="${baseURL}artifact/${f.href}/*view*/">${%view}</a>
                   </td>
                 </tr>