diff --git a/src/system/kernel/disk_device_manager/KDiskDeviceManager.cpp b/src/system/kernel/disk_device_manager/KDiskDeviceManager.cpp
index 8a2ac206b0..2b24e039a6 100644
--- a/src/system/kernel/disk_device_manager/KDiskDeviceManager.cpp
+++ b/src/system/kernel/disk_device_manager/KDiskDeviceManager.cpp
@@ -1129,7 +1129,7 @@ KDiskDeviceManager::_ScanPartition(KPartition *partition)
 status_t
 KDiskDeviceManager::_CheckMediaStatus()
 {
-	while (true) {
+	while (!fTerminating) {
 		int32 cookie = 0;
 		while (KDiskDevice* device = RegisterNextDevice(&cookie)) {
 			DeviceWriteLocker locker(device);