diff --git a/ultrasonic/src/main/java/org/moire/ultrasonic/util/FileUtil.java b/ultrasonic/src/main/java/org/moire/ultrasonic/util/FileUtil.java
index 2a64aa10..c306cbb7 100644
--- a/ultrasonic/src/main/java/org/moire/ultrasonic/util/FileUtil.java
+++ b/ultrasonic/src/main/java/org/moire/ultrasonic/util/FileUtil.java
@@ -75,12 +75,9 @@ public class FileUtil
 		}
 		fileName.append(fileSystemSafe(song.getTitle())).append('.');
 
-		if (song.getTranscodedSuffix() != null)
-		{
+		if (!TextUtils.isEmpty(song.getTranscodedSuffix())) {
 			fileName.append(song.getTranscodedSuffix());
-		}
-		else
-		{
+		} else {
 			fileName.append(song.getSuffix());
 		}