diff --git a/modules/og_subgroups_prop/includes/admin.inc b/modules/og_subgroups_prop/includes/admin.inc
index 68fabec..8f715a3 100644
--- a/modules/og_subgroups_prop/includes/admin.inc
+++ b/modules/og_subgroups_prop/includes/admin.inc
@@ -5,6 +5,11 @@
  */
 function og_subgroups_prop_settings() {
   $form = array();
+  // Find group post content types
+  $types_initial = og_get_types('group_post');
+  foreach ($types_initial as $key=>$value) {
+    $types[$value] = $value;
+  }
   $form['propagte_content'] = array(
     '#type' => 'fieldset',
     '#title' => t('Group posts propagation'),
@@ -22,6 +27,14 @@ function og_subgroups_prop_settings() {
     ),
     '#default_value' => variable_get('og_subgroups_propagate_content', array()),
   );
+  //Content types that will be propagated
+  $form['propagte_content']['og_subgroups_propagate_enabled_'] = array(
+    '#type' => 'checkboxes',
+    '#title' => t('Apply content propagation to these types'),
+    '#options' => $types,
+    '#default_value' => variable_get('og_subgroups_propagate_enabled_', array('')), 
+    '#description' => t('Select content types that will propagate. If none selected all content types will be propagated'),
+  );
   $form['propagte_user'] = array(
     '#type' => 'fieldset',
     '#title' => t('User propagation'),
diff --git a/modules/og_subgroups_prop/og_subgroups_prop.module b/modules/og_subgroups_prop/og_subgroups_prop.module
index afc98d6..90ca847 100644
--- a/modules/og_subgroups_prop/og_subgroups_prop.module
+++ b/modules/og_subgroups_prop/og_subgroups_prop.module
@@ -199,9 +199,22 @@ function og_subgroups_prop_propagate_content(&$node) {
   
   // Determine the directions to move along the tree
   $directions = variable_get('og_subgroups_propagate_content', array());
-  
+
+  // Determine excluded content types
+  $types = variable_get('og_subgroups_propagate_enabled_', array());
+  $enabled_type = True;
+  $i=0;
+  $values = array_values($types);
+  // Determine if none checkbox is selected
+  while ($enabled_type && $i<count($values)){
+    if ($values[$i]) {
+      $enabled_type=FALSE;
+    }
+    $i++;
+  }
+
   // Make sure at least one group has been selected
-  if (isset($node->og_groups) && !empty($node->og_groups)) {
+  if (isset($node->og_groups) && !empty($node->og_groups) && ($enabled_type || ($types[$node->type]))) {
     // Iterate each selected group
     foreach ($node->og_groups as $gid) {
       // Propagate across each direction