diff --git a/src/NzbDrone.Core/Download/Clients/FreeboxDownload/TorrentFreeboxDownload.cs b/src/NzbDrone.Core/Download/Clients/FreeboxDownload/TorrentFreeboxDownload.cs
index 13e0d4334a..3131643794 100644
--- a/src/NzbDrone.Core/Download/Clients/FreeboxDownload/TorrentFreeboxDownload.cs
+++ b/src/NzbDrone.Core/Download/Clients/FreeboxDownload/TorrentFreeboxDownload.cs
@@ -193,7 +193,7 @@ private string GetDownloadDirectory(RemoteMovie remoteMovie = null)
                 destDir = $"{destDir}/{Settings.Category}"; 
             }
 
-            if (remoteMovie != null)
+            if (remoteMovie?.Release?.Title.IsNotNullOrWhiteSpace() ?? false)
             {
                 var folderName = FileNameExtensions.CleanFileName(remoteMovie.Release.Title);
                 destDir = $"{destDir}/{folderName}";