diff --git a/src/core/utilities.cpp b/src/core/utilities.cpp
index 2d760e93..e71e782a 100644
--- a/src/core/utilities.cpp
+++ b/src/core/utilities.cpp
@@ -823,6 +823,7 @@ QString UnicodeToAscii(QString unicode) {
   iconv_close(conv);
 
   QString ret(output_ptr);
+  ret = ret.replace('?', '_');
 
   delete[] input_ptr;
   delete[] output_ptr;
diff --git a/tests/src/organizeformat_test.cpp b/tests/src/organizeformat_test.cpp
index b92e838d..b4ac5680 100644
--- a/tests/src/organizeformat_test.cpp
+++ b/tests/src/organizeformat_test.cpp
@@ -177,7 +177,7 @@ TEST_F(OrganizeFormatTest, ReplaceNonAscii) {
   EXPECT_EQ("Royksopp", format_.GetFilenameForSong(song_));
 
   song_.set_artist(QString::fromUtf8("Владимир Высоцкий"));
-  EXPECT_EQ("????????_????????", format_.GetFilenameForSong(song_));
+  EXPECT_EQ("_________________", format_.GetFilenameForSong(song_));
 
 }