diff --git a/calendar/inc/class.calendar_uiforms.inc.php b/calendar/inc/class.calendar_uiforms.inc.php
index 3b1500a254..09d9251c3c 100644
--- a/calendar/inc/class.calendar_uiforms.inc.php
+++ b/calendar/inc/class.calendar_uiforms.inc.php
@@ -1511,8 +1511,7 @@ class calendar_uiforms extends calendar_ui
 				'no_popup' => isset($_GET['no_popup']),
 				'template' => isset($_GET['template']) ? $_GET['template'] : (isset($_REQUEST['print']) ? 'calendar.print' : 'calendar.edit'),
 			);
-			if($preserv['template'] && ($registry = Link::get_registry('calendar', 'add')) && $registry['template'] == $preserv['template'] &&
-					$this->cal_prefs['new_event_dialog'] == 'edit')
+			if($preserv['template'] && $this->cal_prefs['new_event_dialog'] == 'edit')
 			{
 				// User wants full thing
 				unset($preserv['template']);