diff --git a/src/library/browse/browsethread.cpp b/src/library/browse/browsethread.cpp
index a9c87e73bf9..4a96257624a 100644
--- a/src/library/browse/browsethread.cpp
+++ b/src/library/browse/browsethread.cpp
@@ -226,7 +226,10 @@ void BrowseThread::populateModel() {
 
             item = new QStandardItem(trackMetadata.getTrackInfo().getBpmText());
             item->setToolTip(item->text());
-            item->setData(trackMetadata.getTrackInfo().getBpm().getValue(), Qt::UserRole);
+            const mixxx::Bpm bpm = trackMetadata.getTrackInfo().getBpm();
+            item->setData(bpm.hasValue() ? bpm.getValue()
+                                         : mixxx::Bpm::kValueUndefined,
+                    Qt::UserRole);
             row_data.insert(COLUMN_BPM, item);
 
             item = new QStandardItem(trackMetadata.getTrackInfo().getKey());