diff --git a/sites/all/modules/heartbeat/modules/heartbeat_defaults/heartbeat_defaults.info b/sites/all/modules/heartbeat/modules/heartbeat_defaults/heartbeat_defaults.info
index b39781f372954ef299f753c3683daba38e67fcdc..5ae91ec70659dd688a586325426085d778b0af86 100644
--- a/sites/all/modules/heartbeat/modules/heartbeat_defaults/heartbeat_defaults.info
+++ b/sites/all/modules/heartbeat/modules/heartbeat_defaults/heartbeat_defaults.info
@@ -14,3 +14,4 @@ core = "7.x"
 project = "heartbeat"
 datestamp = "1309033016"
 
+files[] = streams/nodeactivity.inc
\ No newline at end of file
diff --git a/sites/all/modules/heartbeat/modules/heartbeat_defaults/heartbeat_defaults.module b/sites/all/modules/heartbeat/modules/heartbeat_defaults/heartbeat_defaults.module
index 6c9a5a8c8cfb2b602750737fa5b10a25ab78453a..6847fcd61a4bf91776bfa341fd82969c965e48b2 100755
--- a/sites/all/modules/heartbeat/modules/heartbeat_defaults/heartbeat_defaults.module
+++ b/sites/all/modules/heartbeat/modules/heartbeat_defaults/heartbeat_defaults.module
@@ -95,6 +95,33 @@ function heartbeat_defaults_heartbeat_stream_info() {
   $heartbeatstream->variables = array();
   $heartbeatstreams['relationsactivity'] = $heartbeatstream;
 
+  $heartbeatstream = new HeartbeatStreamConfig;
+  $heartbeatstream->disabled = FALSE; /* Edit this to true to make a default heartbeatstream disabled initially */
+  $heartbeatstream->api_version = 1;
+  $heartbeatstream->class = 'nodeactivity';
+  $heartbeatstream->name = 'Node activity';
+  $heartbeatstream->module = 'heartbeat_defaults';
+  $heartbeatstream->title = 'Node activity';
+  $heartbeatstream->path = 'streams/nodeactivity.inc';
+  $heartbeatstream->settings = array(
+    'messages_denied' => array(),
+    'show_message_times' => 1,
+    'show_message_times_grouped' => 1,
+    'poll_messages' => '0',
+    'num_load_max' => '100',
+    'grouping_seconds' => '7200',
+    'has_block' => 1,
+    'block_items_max' => '25',
+    'block_show_pager' => '0',
+    'page_disabled' => 0,
+    'profilePage' => 1,
+    'page_items_max' => '50',
+    'page_show_pager' => 0,
+    'page_pager_ajax' => 0,
+  );
+  $heartbeatstream->variables = array();
+  $heartbeatstreams['nodeactivity'] = $heartbeatstream;
+
   return $heartbeatstreams;
 
 }
diff --git a/sites/all/modules/heartbeat/modules/heartbeat_defaults/streams/nodeactivity.inc b/sites/all/modules/heartbeat/modules/heartbeat_defaults/streams/nodeactivity.inc
new file mode 100755
index 0000000000000000000000000000000000000000..8a7714ff2ec98774511f37d9112103a5375783d9
--- /dev/null
+++ b/sites/all/modules/heartbeat/modules/heartbeat_defaults/streams/nodeactivity.inc
@@ -0,0 +1,70 @@
+<?php
+
+/**
+ * @file
+ *   Node activity access object
+ */
+
+
+/**
+ * Class PrivateHeartbeat
+ * Concrete class to prepare messages for the
+ * current user only
+ */
+class NodeActivity extends HeartbeatStream {
+
+  // Contains the Node ID for which should be filtered
+  protected $nid = 0;
+
+  /**
+   * getNid().
+   *
+   * Function to retrieve the node id
+   */
+  public function getNid() {
+    return $this->nid;
+  }
+
+  /**
+   * setNid().
+   */
+  public function setNid($nid) {
+    $this->nid = $nid;
+  }
+
+  /**
+   * Implementation of construct().
+   */
+  public function construct() {
+    if (arg(0) == "node" && is_numeric(arg(1))) {
+      $this->nid = arg(1);
+    }
+  }
+
+
+  /**
+   * Implementation of queryAlter().
+   */
+  protected function queryAlter() {
+    $this->query
+      ->condition('ha.access', 0, '>')
+      ->condition(db_or()
+        ->condition('ha.nid', $this->nid)
+        ->condition('ha.nid_target', $this->nid)
+      );
+  }
+
+  /**
+   * Function to add a part of a sql to a query built by views UI
+   *
+   * @param object $view The view handler object by reference to add our part to the query
+   */
+  protected function viewsQueryAlter(&$view) {
+    $views->query
+      ->condition('ha.access', 0, '>')
+      ->condition(db_or()
+        ->condition('ha.nid', $this->nid)
+        ->condition('ha.nid_target', $this->nid)
+      ); 
+  }
+}
\ No newline at end of file