diff --git a/src/common/ShlinkVersions.js b/src/common/ShlinkVersions.js
index 90cc0ba5..ae083806 100644
--- a/src/common/ShlinkVersions.js
+++ b/src/common/ShlinkVersions.js
@@ -2,11 +2,12 @@ import React from 'react';
 import PropTypes from 'prop-types';
 import classNames from 'classnames';
 import { pipe } from 'ramda';
+import { ExternalLink } from 'react-external-link';
 import { serverType } from '../servers/prop-types';
 import { versionToPrintable, versionToSemVer } from '../utils/helpers/version';
-import { ExternalLink } from 'react-external-link';
 
 const SHLINK_WEB_CLIENT_VERSION = '%_VERSION_%';
+const normalizeVersion = pipe(versionToSemVer(), versionToPrintable);
 
 const propTypes = {
   selectedServer: serverType,
@@ -14,13 +15,27 @@ const propTypes = {
   clientVersion: PropTypes.string,
 };
 
+const versionLinkPropTypes = {
+  project: PropTypes.oneOf([ 'shlink', 'shlink-web-client' ]).isRequired,
+  version: PropTypes.string.isRequired,
+};
+
+const VersionLink = ({ project, version }) => (
+  <ExternalLink href={`https://github.com/shlinkio/${project}/releases/${version}`} className="text-muted">
+    <b>{version}</b>
+  </ExternalLink>
+);
+
+VersionLink.propTypes = versionLinkPropTypes;
+
 const ShlinkVersions = ({ selectedServer, className, clientVersion = SHLINK_WEB_CLIENT_VERSION }) => {
   const { printableVersion: serverVersion } = selectedServer;
-  const normalizedClientVersion = pipe(versionToSemVer(), versionToPrintable)(clientVersion);
+  const normalizedClientVersion = normalizeVersion(clientVersion);
 
   return (
     <small className={classNames('text-muted', className)}>
-      Client: {<ExternalLink href="https://github.com/shlinkio/shlink-web-client/releases/" className="text-muted"><b>{normalizedClientVersion}</b></ExternalLink>} - Server: {<ExternalLink href="https://github.com/shlinkio/shlink/releases/" className="text-muted"><b>{serverVersion}</b></ExternalLink>}
+      Client: <VersionLink project="shlink-web-client" version={normalizedClientVersion} /> -
+      Server: <VersionLink project="shlink" version={serverVersion} />
     </small>
   );
 };