diff --git a/src/kits/storage/disk_device/DiskSystemAddOnManager.cpp b/src/kits/storage/disk_device/DiskSystemAddOnManager.cpp
index 82247914ba..4d00afe3ef 100644
--- a/src/kits/storage/disk_device/DiskSystemAddOnManager.cpp
+++ b/src/kits/storage/disk_device/DiskSystemAddOnManager.cpp
@@ -200,10 +200,11 @@ DiskSystemAddOnManager::PutAddOn(BDiskSystemAddOn* _addOn)
 			}
 			return;
 		}
+	}
 
 	for (int32 i = 0;
 		 AddOn* addOn = (AddOn*)fAddOnsToBeUnloaded.ItemAt(i); i++) {
-		if (_addOn == addOn->addOn)
+		if (_addOn == addOn->addOn) {
 			_PutAddOn(i);
 			return;
 		}