diff --git a/src/NzbDrone.Core/Download/Clients/QBittorrent/QBittorrent.cs b/src/NzbDrone.Core/Download/Clients/QBittorrent/QBittorrent.cs
index 850f724d0..994016340 100644
--- a/src/NzbDrone.Core/Download/Clients/QBittorrent/QBittorrent.cs
+++ b/src/NzbDrone.Core/Download/Clients/QBittorrent/QBittorrent.cs
@@ -143,11 +143,6 @@ namespace NzbDrone.Core.Download.Clients.QBittorrent
                     SeedRatio = torrent.Ratio
                 };
 
-                if (version >= new Version("2.6.1"))
-                {
-                    item.OutputPath = _remotePathMappingService.RemapRemoteToLocal(Settings.Host, new OsPath(torrent.ContentPath));
-                }
-
                 // Avoid removing torrents that haven't reached the global max ratio.
                 // Removal also requires the torrent to be paused, in case a higher max ratio was set on the torrent itself (which is not exposed by the api).
                 item.CanMoveFiles = item.CanBeRemoved = torrent.State == "pausedUP" && HasReachedSeedLimit(torrent, config);
@@ -214,6 +209,19 @@ namespace NzbDrone.Core.Download.Clients.QBittorrent
                         break;
                 }
 
+                if (version >= new Version("2.6.1"))
+                {
+                    if (torrent.ContentPath != torrent.SavePath)
+                    {
+                        item.OutputPath = _remotePathMappingService.RemapRemoteToLocal(Settings.Host, new OsPath(torrent.ContentPath));
+                    }
+                    else if (item.Status == DownloadItemStatus.Completed)
+                    {
+                        item.Status = DownloadItemStatus.Warning;
+                        item.Message = "Unable to import since content path is equal to root download directory, perhaps Keep top-level folder was disabled for this torrent?";
+                    }
+                }
+
                 queueItems.Add(item);
             }