diff --git a/code/BlogHolder.php b/code/BlogHolder.php
index a147e72..7c03bfa 100644
--- a/code/BlogHolder.php
+++ b/code/BlogHolder.php
@@ -201,6 +201,15 @@ class BlogHolder_Controller extends Page_Controller {
 		return array();
 	}
 	
+	function defaultAction($action) {
+		// Protection against infinite loops when an RSS widget pointing to this page is added to this page
+		if(stristr($_SERVER['HTTP_USER_AGENT'], 'SimplePie')) {
+			return $this->rss();
+		}
+		
+		return parent::defaultAction($action);
+	}
+	
 }
 
 
@@ -228,4 +237,4 @@ class BlogEntry_Form extends Form {
 	}
 }
 
-?>
\ No newline at end of file
+?>