diff --git a/www/tape/ChangerStatus.js b/www/tape/ChangerStatus.js
index e5d143fe..ff8a436c 100644
--- a/www/tape/ChangerStatus.js
+++ b/www/tape/ChangerStatus.js
@@ -519,7 +519,11 @@ Ext.define('PBS.TapeManagement.ChangerStatus', {
 		    let type = entry['entry-kind'];
 		    let id = entry['entry-id'];
 
-		    if (type === 'drive' && drive_entries[id] !== undefined) {
+		    if (type === 'drive') {
+			if (drive_entries[id] === undefined) {
+			    continue;
+			}
+
 			entry = Ext.applyIf(entry, drive_entries[id]);
 			valid_drives.push(drive_entries[id].name);
 		    }