diff --git a/src/servers/index/IndexServer.cpp b/src/servers/index/IndexServer.cpp
index 7c559108fc..515e99975e 100644
--- a/src/servers/index/IndexServer.cpp
+++ b/src/servers/index/IndexServer.cpp
@@ -339,7 +339,7 @@ IndexServer::_StartWatchingAddOns()
 	};
 
 	// when safemode, only B_SYSTEM_ADDONS_DIRECTORY is used
-	for (uint32 i = safeMode ? 4 : 0;
+	for (uint32 i = safeMode ? 3 : 0;
 			i < sizeof(directories) / sizeof(directory_which); i++) {
 		BDirectory directory;
 		node_ref nodeRef;
diff --git a/src/servers/media_addon/MediaAddonServer.cpp b/src/servers/media_addon/MediaAddonServer.cpp
index 1b380d4f3e..2b7f6e611a 100644
--- a/src/servers/media_addon/MediaAddonServer.cpp
+++ b/src/servers/media_addon/MediaAddonServer.cpp
@@ -301,7 +301,7 @@ MediaAddonServer::ReadyToRun()
 	};
 
 	// when safemode, only B_SYSTEM_ADDONS_DIRECTORY is used
-	for (uint32 i = safeMode ? 4 : 0;
+	for (uint32 i = safeMode ? 3 : 0;
 			i < sizeof(directories) / sizeof(directory_which); i++) {
 		BDirectory directory;
 		node_ref nodeRef;