diff --git a/src/main/java/edu/harvard/iq/dataverse/DatasetPage.java b/src/main/java/edu/harvard/iq/dataverse/DatasetPage.java
index 8b546a037d2..970ba254a45 100644
--- a/src/main/java/edu/harvard/iq/dataverse/DatasetPage.java
+++ b/src/main/java/edu/harvard/iq/dataverse/DatasetPage.java
@@ -3110,6 +3110,9 @@ private void restrictFiles(boolean restricted) throws CommandException {
     }
 
     public int getRestrictedFileCount() {
+        if (workingVersion == null){
+            return 0;
+        }
         int restrictedFileCount = 0;
         for (FileMetadata fmd : workingVersion.getFileMetadatas()) {
             if (fmd.isRestricted()) {
diff --git a/src/main/webapp/dataset-license-terms.xhtml b/src/main/webapp/dataset-license-terms.xhtml
index e00a0cb2a7e..0d109f73f06 100644
--- a/src/main/webapp/dataset-license-terms.xhtml
+++ b/src/main/webapp/dataset-license-terms.xhtml
@@ -238,13 +238,15 @@
                                <span class="glyphicon glyphicon-question-sign tooltip-icon"
                                      data-toggle="tooltip" data-placement="auto right" data-original-title="#{bundle['file.dataFilesTab.terms.list.termsOfAccess.restrictedFiles.title']}"></span>
                            </label>
-                           <div class="col-sm-9">
-                               <p>
-                                   <h:outputFormat value="#{bundle['file.dataFilesTab.terms.list.termsOfAccess.restrictedFiles.txt']}">
-                                       <f:param value="#{DatasetPage.restrictedFileCount}"/>
-                                   </h:outputFormat>
-                               </p>
-                           </div>
+                           <ui:fragment rendered="#{datasetPage == true}">
+                               <div class="col-sm-9">
+                                   <p>
+                                       <h:outputFormat value="#{bundle['file.dataFilesTab.terms.list.termsOfAccess.restrictedFiles.txt']}">
+                                           <f:param value="#{DatasetPage.restrictedFileCount}"/>
+                                       </h:outputFormat>
+                                   </p>
+                               </div>
+                           </ui:fragment>
                        </div>
                        <div class="form-group" jsf:rendered="#{!empty termsOfUseAndAccess.termsOfAccess}">
                            <label for="metadata_TermsAccess" class="col-sm-3 control-label">
@@ -256,7 +258,7 @@
                                <p><h:outputText value="#{MarkupChecker:sanitizeBasicHTML(termsOfUseAndAccess.termsOfAccess)}" escape="false"/></p>
                            </div>
                        </div>
-                       <div class="form-group" jsf:rendered="#{!settingsWrapper.publicInstall and (DatasetPage.restrictedFileCount > 0)}">
+                       <div class="form-group" jsf:rendered="#{!settingsWrapper.publicInstall and ( datasetPage == true and DatasetPage.restrictedFileCount > 0)}">
                            <label for="metadata_RequestAccess" class="col-sm-3 control-label">
                                #{bundle['file.dataFilesTab.terms.list.termsOfAccess.requestAccess']}
                                <span class="glyphicon glyphicon-question-sign tooltip-icon"
diff --git a/src/main/webapp/manage-templates.xhtml b/src/main/webapp/manage-templates.xhtml
index 781634a8238..3d19494c177 100644
--- a/src/main/webapp/manage-templates.xhtml
+++ b/src/main/webapp/manage-templates.xhtml
@@ -184,6 +184,7 @@
                         </ui:include>
                         <ui:include src="dataset-license-terms.xhtml">
                             <ui:param name="managePage" value="true"/>
+                            <ui:param name="datasetPage" value="false"/> 
                             <ui:param name="termsOfUseAndAccess" value="#{TemplatePage.template.termsOfUseAndAccess}" />
                         </ui:include>
                         <div class="button-block">