diff --git a/src/main/java/edu/harvard/iq/dataverse/SettingsWrapper.java b/src/main/java/edu/harvard/iq/dataverse/SettingsWrapper.java
index f1cb22887ca..122a076720a 100644
--- a/src/main/java/edu/harvard/iq/dataverse/SettingsWrapper.java
+++ b/src/main/java/edu/harvard/iq/dataverse/SettingsWrapper.java
@@ -241,5 +241,24 @@ private void initLocaleSettings() {
             // do we want to know? - probably not
         }
     }
+
+    public boolean isMakeDataCountEnabled(){
+        String logPath = systemConfig.getMDCLogPath();
+        if (logPath != null) {
+            return true;
+        } else {
+            return false;
+        }
+    }
+
+    public boolean isDoiInstallation() {
+        String protocol = getValueForKey(SettingsServiceBean.Key.Protocol);
+        if ("doi".equals(protocol)) {
+            return true;
+        } else {
+            return false;
+        }
+    }
+
 }
 
diff --git a/src/main/webapp/dataset.xhtml b/src/main/webapp/dataset.xhtml
index 605858207cf..7d4e8cbad1d 100644
--- a/src/main/webapp/dataset.xhtml
+++ b/src/main/webapp/dataset.xhtml
@@ -380,11 +380,11 @@
                                     <div id="metrics-heading">
                                         #{bundle['metrics.dataset.title']}
                                         <span class="glyphicon glyphicon-question-sign tooltip-icon" data-toggle="tooltip" data-placement="auto top" 
-                                                data-original-title="#{empty settingsServiceBean.get(':MDCLogPath') ? bundle['metrics.dataset.tip.default'] : bundle['metrics.dataset.tip.makedatacount']}"></span>
+                                                data-original-title="#{settingsWrapper.makeDataCountEnabled ? bundle['metrics.dataset.tip.makedatacount'] : bundle['metrics.dataset.tip.default']}"></span>
                                     </div>
                                     <div id="metrics-body">
                                         <!-- Classic downloads -->
-                                        <div class="metrics-count-block" jsf:rendered="#{empty settingsServiceBean.get(':MDCLogPath')}">
+                                        <div class="metrics-count-block" jsf:rendered="#{!settingsWrapper.makeDataCountEnabled}">
                                             <h:outputFormat value="{0} #{bundle['metrics.downloads']}">
                                                 <f:param value="#{guestbookResponseServiceBean.getCountGuestbookResponsesByDatasetId(DatasetPage.dataset.id)}"/>
                                             </h:outputFormat>
@@ -392,7 +392,7 @@
                                                     data-toggle="tooltip" data-placement="auto top" data-original-title="#{bundle['metrics.dataset.downloads.default.tip']}"></span>
                                         </div>
                                         <!-- Make Data Count views -->
-                                        <div class="metrics-count-block" jsf:rendered="#{not empty settingsServiceBean.get(':MDCLogPath')}">
+                                        <div class="metrics-count-block" jsf:rendered="#{settingsWrapper.makeDataCountEnabled}">
                                             <h:outputFormat value="{0} #{bundle['metrics.views']}">
                                                 <f:param value="#{datasetMetricsServiceBean.getMetrics(DatasetPage.dataset).getViewsTotal()}"/>
                                             </h:outputFormat>
@@ -400,7 +400,7 @@
                                                     data-toggle="tooltip" data-placement="auto top" data-original-title="#{bundle['metrics.dataset.views.tip']}"></span>
                                         </div>
                                         <!-- Make Data Count downloads -->
-                                        <div class="metrics-count-block" jsf:rendered="#{not empty settingsServiceBean.get(':MDCLogPath')}">
+                                        <div class="metrics-count-block" jsf:rendered="#{settingsWrapper.makeDataCountEnabled}">
                                             <h:outputFormat value="{0} #{bundle['metrics.downloads']}">
                                                 <f:param value="#{datasetMetricsServiceBean.getMetrics(DatasetPage.dataset).getDownloadsTotal()}"/>
                                             </h:outputFormat>
@@ -408,7 +408,7 @@
                                                     data-toggle="tooltip" data-placement="auto top" data-original-title="#{bundle['metrics.dataset.downloads.makedatacount.tip']}"></span>
                                         </div>
                                         <!-- Make Data Count citations (DOIs only, not Handles) -->
-                                        <div class="metrics-count-block" jsf:rendered="#{true}">
+                                        <div class="metrics-count-block" jsf:rendered="#{settingsWrapper.makeDataCountEnabled and settingsWrapper.doiInstallation}">
                                             <p:commandLink oncomplete="PF('citationsDialog').show();">
                                                 <h:outputFormat value="{0} #{bundle['metrics.citations']}">
                                                     <f:param value="#{fn:length(datasetExternalCitationsServiceBean.getDatasetExternalCitationsByDataset(DatasetPage.dataset))}"/>
diff --git a/src/main/webapp/file.xhtml b/src/main/webapp/file.xhtml
index 0406249f59a..0ae5ae33fb0 100644
--- a/src/main/webapp/file.xhtml
+++ b/src/main/webapp/file.xhtml
@@ -319,11 +319,11 @@
                                                 <div id="metrics-heading">
                                                     #{bundle['metrics.file.title']}
                                                     <span class="glyphicon glyphicon-question-sign tooltip-icon" data-toggle="tooltip" data-placement="auto top" 
-                                                            data-original-title="#{empty settingsServiceBean.get(':MDCLogPath') ? bundle['metrics.file.tip.default'] : bundle['metrics.file.tip.makedatacount']}"></span>
+                                                            data-original-title="#{settingsWrapper.makeDataCountEnabled ? bundle['metrics.file.tip.makedatacount'] : bundle['metrics.file.tip.default']}"></span>
                                                 </div>
                                                 <div id="metrics-body">
                                                     <!-- Classic downloads -->
-                                                    <div class="metrics-count-block" jsf:rendered="#{empty settingsServiceBean.get(':MDCLogPath')}">
+                                                    <div class="metrics-count-block" jsf:rendered="#{!settingsWrapper.makeDataCountEnabled}">
                                                         <h:outputFormat value="{0} #{bundle['metrics.downloads']}">
                                                             <f:param value="#{guestbookResponseServiceBean.getCountGuestbookResponsesByDataFileId(FilePage.fileId)}"/>
                                                         </h:outputFormat>
@@ -331,7 +331,7 @@
                                                               data-toggle="tooltip" data-placement="auto top" data-original-title="#{bundle['metrics.file.downloads.tip']}"></span>
                                                     </div>
                                                     <!-- Make Data Count downloads -->
-                                                    <div class="metrics-count-block" jsf:rendered="#{not empty settingsServiceBean.get(':MDCLogPath')}">
+                                                    <div class="metrics-count-block" jsf:rendered="#{settingsWrapper.makeDataCountEnabled}">
                                                         <h:outputFormat value="{0} #{bundle['metrics.downloads']}">
                                                             <f:param value="#{guestbookResponseServiceBean.getCountGuestbookResponsesByDataFileId(FilePage.fileId)}"/>
                                                         </h:outputFormat>