diff --git spaces_og/spaces_og.module spaces_og/spaces_og.module
index 3595912..aa96f91 100644
--- spaces_og/spaces_og.module
+++ spaces_og/spaces_og.module
@@ -307,16 +307,21 @@ function spaces_og_nodeapi(&$node, $op, $teaser = NULL, $page = NULL) {
         break;
       case 'prepare':
       case 'presave':
-        $space = spaces_get_space();
-        if ($space && $space->type == 'og') {
-          _spaces_og_enforce_privacy($space->id, $node);
+        if (isset($node->spaces_og_audience) && ((int)$node->spaces_og_audience !== 0)) {
+          $group = $node->spaces_og_audience;
         }
-        else if (!empty($node->og_groups)) {
-          _spaces_og_enforce_privacy(current($node->og_groups), $node);
+        elseif (($space = spaces_get_space()) && $space->type == 'og') {
+          $group = $space->id;
         }
-        if (isset($node->spaces_og_audience) && ((int)$node->spaces_og_audience !== 0)) {
-          $node->og_groups[$node->spaces_og_audience] = $node->spaces_og_audience;
+        elseif (!empty($node->og_groups)) {
+          $group = current($node->og_groups);
         }
+
+        // If group, set privacy 
+        if ($group) {
+          _spaces_og_enforce_privacy($group, $node);
+        }
+
         break;
     }
   }