diff --git a/data/interfaces/default/config.html b/data/interfaces/default/config.html
index 4c288063..fd7d6e55 100644
--- a/data/interfaces/default/config.html
+++ b/data/interfaces/default/config.html
@@ -101,6 +101,7 @@
 
                             <fieldset>
                                 <legend>Interval</legend>
+                                Set an interval to 0 to disable a task.
                                 <div class="row">
                                     <label title="Time between two searches for new downloads.">
                                         Search Interval
diff --git a/headphones/__init__.py b/headphones/__init__.py
index 0e01b9b1..63946282 100644
--- a/headphones/__init__.py
+++ b/headphones/__init__.py
@@ -143,8 +143,8 @@ def initialize(config_file):
                 logger.error("Could not create cache dir '%s': %s", DATA_DIR, e)
 
         # Sanity check for search interval. Set it to at least 6 hours
-        if CONFIG.SEARCH_INTERVAL < 360:
-            logger.info("Search interval too low. Resetting to 6 hour minimum")
+        if CONFIG.SEARCH_INTERVAL < 360 and CONFIG.SEARCH_INTERVAL != 0:
+            logger.info("Search interval too low. Resetting to 6 hour minimum.")
             CONFIG.SEARCH_INTERVAL = 360
 
         # Initialize the database
@@ -275,22 +275,25 @@ def initialize_scheduler():
             SCHED.shutdown()
             SCHED.remove_all_jobs()
 
-        # Then add all jobs
-        SCHED.add_job(updater.dbUpdate, trigger=IntervalTrigger(
-            hours=CONFIG.UPDATE_DB_INTERVAL))
-        SCHED.add_job(searcher.searchforalbum, trigger=IntervalTrigger(
-            minutes=CONFIG.SEARCH_INTERVAL))
-        SCHED.add_job(librarysync.libraryScan, trigger=IntervalTrigger(
-            hours=CONFIG.LIBRARYSCAN_INTERVAL))
-
-        if CONFIG.CHECK_GITHUB:
-            SCHED.add_job(versioncheck.checkGithub, trigger=IntervalTrigger(
-                minutes=CONFIG.CHECK_GITHUB_INTERVAL))
-
+        # Regular jobs
+        if CONFIG.UPDATE_DB_INTERVAL > 0:
+            SCHED.add_job(updater.dbUpdate, trigger=IntervalTrigger(
+                hours=CONFIG.UPDATE_DB_INTERVAL))
+        if CONFIG.SEARCH_INTERVAL > 0:
+            SCHED.add_job(searcher.searchforalbum, trigger=IntervalTrigger(
+                minutes=CONFIG.SEARCH_INTERVAL))
+        if CONFIG.LIBRARYSCAN_INTERVAL > 0:
+            SCHED.add_job(librarysync.libraryScan, trigger=IntervalTrigger(
+                hours=CONFIG.LIBRARYSCAN_INTERVAL))
         if CONFIG.DOWNLOAD_SCAN_INTERVAL > 0:
             SCHED.add_job(postprocessor.checkFolder, trigger=IntervalTrigger(
                 minutes=CONFIG.DOWNLOAD_SCAN_INTERVAL))
 
+        # Update check
+        if CONFIG.CHECK_GITHUB:
+            SCHED.add_job(versioncheck.checkGithub, trigger=IntervalTrigger(
+                minutes=CONFIG.CHECK_GITHUB_INTERVAL))
+
         # Remove Torrent + data if Post Processed and finished Seeding
         if CONFIG.TORRENT_REMOVAL_INTERVAL > 0:
             SCHED.add_job(torrentfinished.checkTorrentFinished,
diff --git a/headphones/webserve.py b/headphones/webserve.py
index 5f5624db..9da2a1eb 100644
--- a/headphones/webserve.py
+++ b/headphones/webserve.py
@@ -1241,7 +1241,7 @@ class WebInterface(object):
             headphones.CONFIG.add_extra_newznab(extra_newznab)
 
         # Sanity checking
-        if headphones.CONFIG.SEARCH_INTERVAL < 360:
+        if headphones.CONFIG.SEARCH_INTERVAL < 360 and headphones.config.SEARCH_INTERVAL != 0:
             logger.info("Search interval too low. Resetting to 6 hour minimum")
             headphones.CONFIG.SEARCH_INTERVAL = 360