diff --git a/CHANGELOG.txt b/CHANGELOG.txt
index d318b08cade1abcdcc34f22c58dd99dc8bfc8225..8f0ba1c7962bb7077ddde4086e1cd9811256aed7 100644
--- a/CHANGELOG.txt
+++ b/CHANGELOG.txt
@@ -4,6 +4,7 @@
 Feeds 6.x 1.0 xxxxx xx, 2010-xx-xx
 ----------------------------------
 
+- alex_b: Stop PubSubHubbub from subscribing if it is not enabled.
 - #711664 neclimdul: guarantee compatibility with CTools 1.4  by declaring that
   Feeds uses hooks to define plugins via hook_ctools_plugin_plugins().
 - #718460 jerdavis: In FeedsNodeProcessor, clear items only for the current
diff --git a/plugins/FeedsHTTPFetcher.inc b/plugins/FeedsHTTPFetcher.inc
index 5d6f0d22ea5cab7e16e4a1ac241b1cded2376865..d8f724e201a24257d46948adc4d0d81b0edaa1b7 100644
--- a/plugins/FeedsHTTPFetcher.inc
+++ b/plugins/FeedsHTTPFetcher.inc
@@ -138,14 +138,18 @@ class FeedsHTTPFetcher extends FeedsFetcher {
    * Override sourceSave() - subscribe to hub.
    */
   public function sourceSave(FeedsSource $source) {
-    $this->subscribe($source);
+    if ($this->config['use_pubsubhubbub']) {
+      $this->subscribe($source);
+    }
   }
 
   /**
    * Override sourceDelete() - unsubscribe from hub.
    */
   public function sourceDelete(FeedsSource $source) {
-    $this->unsubscribe($source);
+    if ($this->config['use_pubsubhubbub']) {
+      $this->unsubscribe($source);
+    }
   }
 
   /**