diff --git a/src/trackerd/trackerd.c b/src/trackerd/trackerd.c
index a85fcf2..db381b4 100644
--- a/src/trackerd/trackerd.c
+++ b/src/trackerd/trackerd.c
@@ -1066,6 +1066,14 @@ process_files_thread (void)
 									tracker->dir_list = NULL;
 								}
 
+								g_slist_foreach (tracker->crawl_directory_list, (GFunc) schedule_dir_check, db_con);
+
+								if (tracker->crawl_directory_list) {
+									g_slist_foreach (tracker->crawl_directory_list, (GFunc) g_free, NULL);
+									g_slist_free (tracker->crawl_directory_list);
+									tracker->crawl_directory_list = NULL;
+								}
+
 								g_slist_foreach (tracker->watch_directory_roots_list, (GFunc) schedule_dir_check, db_con);
 
 								if (tracker->dir_list) {
@@ -1933,10 +1941,6 @@ sanity_check_option_values ()
 		tracker_set_language (tracker->language, TRUE);
 	}
 
-	if (!tracker->watch_directory_roots_list) {
-		tracker->watch_directory_roots_list = g_slist_prepend (tracker->watch_directory_roots_list, g_strdup (g_get_home_dir()));
-	}
-
 	if (tracker->throttle > 20) {
 		tracker->throttle = 20;
 	} else 	if (tracker->throttle < 0) {