diff --git includes/view.inc includes/view.inc
index 0053771..4586ad0 100644
--- includes/view.inc
+++ includes/view.inc
@@ -115,9 +115,15 @@ class view extends views_db_object {
    * Set the items per page on the pager.
    */
   function set_items_per_page($items_per_page) {
+    if (empty($this->query)) {
+      $this->init_query();
+    }
     if (empty($this->query->pager)) {
       $this->query->init_pager($this);
     }
+    if ($items_per_page == 0) {
+      $this->query->pager = $this->display_handler->get_plugin('pager', 'none');
+    }
     $this->query->pager->set_items_per_page($items_per_page);
   }