diff --git a/modules/monitoring/application/controllers/ListController.php b/modules/monitoring/application/controllers/ListController.php
index cba841db0..8f939bf91 100644
--- a/modules/monitoring/application/controllers/ListController.php
+++ b/modules/monitoring/application/controllers/ListController.php
@@ -168,8 +168,14 @@ class Monitoring_ListController extends Controller
             'host_address'          =>  'Host Address',
             'host_last_check'       =>  'Last Host Check'
         ));
-        // TODO: Workaround, paginate should be able to fetch limit from new params
-        $this->view->services = $query->paginate($this->params->get('limit'));
+        $limit = $this->params->get('limit');
+        $this->view->limit = $limit;
+        if ($limit) {
+            // TODO: Workaround, paginate should be able to fetch limit from new params
+            $this->view->services = $query->paginate($this->params->get('limit'));
+        } else {
+            $this->view->services = $query->getQuery()->fetchAll();
+        }
     }
 
     /**
diff --git a/modules/monitoring/application/views/scripts/list/services.phtml b/modules/monitoring/application/views/scripts/list/services.phtml
index a8a8429fb..75258c9db 100644
--- a/modules/monitoring/application/views/scripts/list/services.phtml
+++ b/modules/monitoring/application/views/scripts/list/services.phtml
@@ -10,9 +10,12 @@ if (!$this->compact): ?>
 <?= $this->filterPreview ?>
 <?php endif ?>
 </div>
-
+<?php if ($this->limit): ?>
 <?= $this->widget('limiter')->setCurrentPageCount($this->services->count()) ?>
 <?= $this->paginationControl($services, null, null, array('preserve' => $this->preserve)) ?>
+<?php else: ?>
+<?= $this->widget('limiter') ?>
+<?php endif ?>
 <?= $this->selectionToolbar('multi', $this->href('monitoring/multi/service?' . $this->filter->toQueryString())) ?>
 </div>