diff --git a/views/bootstrap/class.DocumentVersionDetail.php b/views/bootstrap/class.DocumentVersionDetail.php
index d4256223a..f70279745 100644
--- a/views/bootstrap/class.DocumentVersionDetail.php
+++ b/views/bootstrap/class.DocumentVersionDetail.php
@@ -129,10 +129,12 @@ class SeedDMS_View_DocumentVersionDetail extends SeedDMS_Theme_Style {
 	<?php
 				break;
 			case 'application/pdf':
+				if (!$settings->extensionIsDisabled('pdfviewer')) {
 				$this->contentHeading(getMLText("preview"));
 	?>
 				<iframe src="<?= $settings->_httpRoot ?>ext/pdfviewer/res/web/viewer.html?file=<?=  urlencode(getBaseUrl().$settings->_httpRoot.'op/op.ViewOnline.php?documentid='.$version->getDocument()->getID().'&version='.$version->getVersion()); ?>" width="100%" height="700px"></iframe>
-	<?php
+<?php
+				}
 				break;
 			case 'image/svg+xml':
 			case 'image/jpg':
diff --git a/views/bootstrap/class.ViewDocument.php b/views/bootstrap/class.ViewDocument.php
index 93475228b..f50ac24be 100644
--- a/views/bootstrap/class.ViewDocument.php
+++ b/views/bootstrap/class.ViewDocument.php
@@ -612,12 +612,14 @@ $(document).ready( function() {
 <?php
 					break;
 				case 'application/pdf':
+					if (!$settings->extensionIsDisabled('pdfviewer')) {
 					$this->contentHeading(getMLText("preview"));
 ?>
 			<div style="width:100%; height: 0; position:relative; padding-top: 141%;">
 			<iframe src="<?= $settings->_httpRoot ?>ext/pdfviewer/res/web/viewer.html?file=<?php echo urlencode(getBaseUrl().$settings->_httpRoot.'op/op.ViewOnline.php?documentid='.$latestContent->getDocument()->getID().'&version='.$latestContent->getVersion()); ?>" _width="100%" _height="100%" style="position: absolute; top: 0; left: 0; bottom: 0; right: 0; width: 100%; height: 100%"></iframe>
 			</div>
 <?php
+					}
 					break;
 				case 'image/svg+xml':
 				case 'image/jpg':