diff --git a/src/media_library.cpp b/src/media_library.cpp
index 97d5b7d7..93193dc8 100644
--- a/src/media_library.cpp
+++ b/src/media_library.cpp
@@ -187,7 +187,8 @@ void MediaLibrary::Update()
 				Albums->AddOption(std::make_pair("(" + *j + ") " + *it, SearchConstraints(*it, *j)));
 		}
 		utf_to_locale(Artists->Current());
-		Albums->Sort<CaseInsensitiveSorting>((*Albums)[0].first == "<no album>");
+		if (!Albums->Empty())
+			Albums->Sort<CaseInsensitiveSorting>((*Albums)[0].first == "<no album>");
 		Albums->Window::Clear();
 		Albums->Refresh();
 	}