diff --git a/e107_handlers/form_handler.php b/e107_handlers/form_handler.php
index 47ac01d53..44ec03e4b 100644
--- a/e107_handlers/form_handler.php
+++ b/e107_handlers/form_handler.php
@@ -2237,6 +2237,12 @@ class e_form
 	 */
 	function renderRelated($parm,$tags, $curVal) //XXX TODO Cache!
 	{
+		
+		if(empty($tags))
+		{
+			return;	
+		}
+		
 		if(!varset($parm['limit']))
 		{
 			$parm = array('limit' => 5);