diff --git a/og_forum.module b/og_forum.module
index 93d2330..545ac0c 100644
--- a/og_forum.module
+++ b/og_forum.module
@@ -306,7 +306,7 @@ function og_forum_get_sql() {
   $return['distinct'] = TRUE;
   $return['join'] = "LEFT JOIN {og_term} ogt ON ogt.tid = t.tid";
   // Either the forum is unconfigured or public or public
-  $return['where'] = "ogt.public > " . PRIVATE_BY_GROUP_OWNER;
+  $return['where'] = "ogt.public is NULL OR ogt.public > " . PRIVATE_BY_GROUP_OWNER;
   
   if (!empty($user->og_groups)) { 
     // Add own user groups into accessible forums/TIDs
@@ -481,7 +481,7 @@ function og_forum_nodeapi($node, $op, $teaser = NULL, $page = NULL) {
           if ($forums[$node->tid] == PUBLIC_AUTO) {//the forum is in an auto settable state
             $should_be_public = FALSE;
             $sql3 = "SELECT DISTINCT COUNT(oap.nid) FROM {node} n INNER JOIN {og_access_post} oap ON oap.nid = n.nid INNER JOIN {term_node} tn ON tn.nid = oap.nid
-			WHERE n.type = 'forum' AND oap.og_public = 1 AND tn.tid = %d";
+			WHERE n.type = 'forum' AND (oap.og_public = NULL OR oap.og_public = 1) AND tn.tid = %d";
             if (!$count = db_result(db_query($sql3, $node->tid))) {
               db_query($sql2, PRIVATE_DEFAULT, $node->tid);
               foreach ($forums as $tid => $public) {