diff --git a/calendar/setup/setup.inc.php b/calendar/setup/setup.inc.php
index 951ebaf86a..e0d054d1da 100755
--- a/calendar/setup/setup.inc.php
+++ b/calendar/setup/setup.inc.php
@@ -10,7 +10,7 @@
  */
 
 $setup_info['calendar']['name']    = 'calendar';
-$setup_info['calendar']['version'] = '17.1.001';
+$setup_info['calendar']['version'] = '17.1.002';
 $setup_info['calendar']['app_order'] = 3;
 $setup_info['calendar']['enable']  = 1;
 $setup_info['calendar']['index']   = 'calendar.calendar_uiviews.index&ajax=true';
diff --git a/calendar/setup/tables_update.inc.php b/calendar/setup/tables_update.inc.php
index 5f3065b8d6..793255c47e 100644
--- a/calendar/setup/tables_update.inc.php
+++ b/calendar/setup/tables_update.inc.php
@@ -2764,4 +2764,11 @@ function calendar_upgrade17_1()
 	};
 	Api\Preferences::change_preference('calendar', 'birthdays_as_events', $change);
 	return $GLOBALS['setup_info']['calendar']['currentver'] = '17.1.001';
+}
+
+function calendar_upgrade17_1_001()
+{
+	// Update resources preference
+	Api\Preferences::change_preference('calendar', 'defaultresource_sel', 'resources_conflict', 'resources');
+	return $GLOBALS['setup_info']['calendar']['currentver'] = '17.1.002';
 }
\ No newline at end of file