diff --git a/sites/all/modules/context_respect/plugins/context_respect_reaction_block.inc b/sites/all/modules/context_respect/plugins/context_respect_reaction_block.inc
index 83d6d81b0f17a26e530cc2dd505030c60cfce227..e82da58eec6caf813b3f599e4478e5fb258f92ad 100644
--- a/sites/all/modules/context_respect/plugins/context_respect_reaction_block.inc
+++ b/sites/all/modules/context_respect/plugins/context_respect_reaction_block.inc
@@ -75,15 +75,22 @@ class context_respect_reaction_block extends context_reaction_block {
    */
   protected function check_role_match($block) {
     global $user;
+    
     //Always return true for admin user
     if($user->uid == 1) {
-      return true;
+      return TRUE;
     }
+    
     $rids = array_keys($user->roles);
     $result = db_query("SELECT rid FROM {block_role} b WHERE b.delta = :delta and b.module = :module", array(':delta' => $block->delta, ':module' => $block->module));
-    $role_match = FALSE;
+    
+    // if the block has no roles, return TRUE until they choose to use visibility settings
+    if (!$result->rowCount()) {
+      return TRUE;
+    }
+    
     foreach($result as $b) {
-      if(in_array($b->rid,$rids)) {
+      if(in_array($b->rid, $rids)) {
         $role_match = TRUE;
         break;
       }
@@ -104,7 +111,7 @@ class context_respect_reaction_block extends context_reaction_block {
   protected function check_page_match($block) {
     $block_data = db_query("SELECT pages, visibility FROM {block} b where b.delta = :delta and b.module = :module", array(':delta' => $block->delta, ':module' => $block->module))->fetch();
     $page_match = TRUE;
-    //Bpass check if there are no pages set for a block
+    // Bypass check if there are no pages set for a block
     if (!$block_data->pages || drupal_match_path($_GET['q'], 'admin/structure/context*' || !$block_data)) {
       return TRUE;
     }
@@ -124,4 +131,4 @@ class context_respect_reaction_block extends context_reaction_block {
     }
     return $page_match;
   }
-}
\ No newline at end of file
+}
