diff --git a/app/Http/Controllers/PageController.php b/app/Http/Controllers/PageController.php
index c11355db5..36cdd3aef 100644
--- a/app/Http/Controllers/PageController.php
+++ b/app/Http/Controllers/PageController.php
@@ -161,13 +161,19 @@ class PageController extends Controller
         $page->html = $this->entityRepo->renderPage($page);
         $sidebarTree = $this->entityRepo->getBookChildren($page->book);
         $pageNav = $this->entityRepo->getPageNav($page->html);
-        $page->load(['comments.createdBy']);
+
+        // check if the comment's are enabled
+        $areCommentsEnabled = !setting('app-disable-comments');
+        if ($areCommentsEnabled) {
+          $page->load(['comments.createdBy']);
+        }
 
         Views::add($page);
         $this->setPageTitle($page->getShortName());
         return view('pages/show', [
             'page' => $page,'book' => $page->book,
             'current' => $page, 'sidebarTree' => $sidebarTree,
+            'commentsEnabled' => $areCommentsEnabled,
             'pageNav' => $pageNav]);
     }
 
diff --git a/resources/views/pages/show.blade.php b/resources/views/pages/show.blade.php
index 854417962..3e10ac63a 100644
--- a/resources/views/pages/show.blade.php
+++ b/resources/views/pages/show.blade.php
@@ -131,7 +131,7 @@
     </div>
 
     @include('partials/book-tree', ['book' => $book, 'sidebarTree' => $sidebarTree])
-    
+
 @stop
 
 @section('body')
@@ -148,10 +148,11 @@
         @include('pages/page-display')
 
     </div>
-
-    <div class="container small nopad">
-        @include('comments/comments', ['page' => $page])
-    </div>
+    @if ($commentsEnabled)
+      <div class="container small nopad">
+          @include('comments/comments', ['page' => $page])
+      </div>
+    @endif
 @stop
 
 @section('scripts')
diff --git a/resources/views/settings/index.blade.php b/resources/views/settings/index.blade.php
index 09e480b43..bee3ac8da 100644
--- a/resources/views/settings/index.blade.php
+++ b/resources/views/settings/index.blade.php
@@ -38,6 +38,11 @@
                             <p class="small">{{ trans('settings.app_secure_images_desc') }}</p>
                             @include('components.toggle-switch', ['name' => 'setting-app-secure-images', 'value' => setting('app-secure-images')])
                         </div>
+                        <div class="form-group">
+                            <label>{{ trans('settings.app_disable_comments') }}</label>
+                            <p class="small">{{ trans('settings.app_disable_comments_desc') }}</p>
+                            @include('components.toggle-switch', ['name' => 'setting-app-disable-comments', 'value' => setting('app-disable-comments')])
+                        </div>
                         <div class="form-group">
                             <label for="setting-app-editor">{{ trans('settings.app_editor') }}</label>
                             <p class="small">{{ trans('settings.app_editor_desc') }}</p>