diff --git a/src/NzbDrone.Core/HealthCheck/Checks/DeprecatedDroneFactoryCheck.cs b/src/NzbDrone.Core/HealthCheck/Checks/DeprecatedDroneFactoryCheck.cs
new file mode 100644
index 000000000..2278cdc53
--- /dev/null
+++ b/src/NzbDrone.Core/HealthCheck/Checks/DeprecatedDroneFactoryCheck.cs
@@ -0,0 +1,30 @@
+using NzbDrone.Common.Disk;
+using NzbDrone.Common.Extensions;
+using NzbDrone.Core.Configuration;
+using NzbDrone.Core.Configuration.Events;
+
+namespace NzbDrone.Core.HealthCheck.Checks
+{
+    [CheckOn(typeof(ConfigSavedEvent))]
+    public class DeprecatedDroneFactoryCheck : HealthCheckBase
+    {
+        private readonly IConfigService _configService;
+
+        public DeprecatedDroneFactoryCheck(IConfigService configService)
+        {
+            _configService = configService;
+        }
+
+        public override HealthCheck Check()
+        {
+            var droneFactoryFolder = _configService.DownloadedEpisodesFolder;
+
+            if (droneFactoryFolder.IsNullOrWhiteSpace())
+            {
+                return new HealthCheck(GetType());
+            }
+
+            return new HealthCheck(GetType(), HealthCheckResult.Warning, "Drone Factory is deprecated and should not be used", "#drone-factory-is-deprecated");
+        }
+    }
+}
diff --git a/src/NzbDrone.Core/NzbDrone.Core.csproj b/src/NzbDrone.Core/NzbDrone.Core.csproj
index ec0356692..3fe77287a 100644
--- a/src/NzbDrone.Core/NzbDrone.Core.csproj
+++ b/src/NzbDrone.Core/NzbDrone.Core.csproj
@@ -566,6 +566,7 @@
     <Compile Include="HealthCheck\Checks\AppDataLocationCheck.cs" />
     <Compile Include="HealthCheck\Checks\DownloadClientCheck.cs" />
     <Compile Include="HealthCheck\Checks\DownloadClientStatusCheck.cs" />
+    <Compile Include="HealthCheck\Checks\DeprecatedDroneFactoryCheck.cs" />
     <Compile Include="HealthCheck\Checks\MountCheck.cs" />
     <Compile Include="HealthCheck\Checks\DroneFactoryCheck.cs" />
     <Compile Include="HealthCheck\Checks\ImportMechanismCheck.cs" />
diff --git a/src/UI/Settings/DownloadClient/DroneFactory/DroneFactoryViewTemplate.hbs b/src/UI/Settings/DownloadClient/DroneFactory/DroneFactoryViewTemplate.hbs
index 9043ad2f5..b7c39170c 100644
--- a/src/UI/Settings/DownloadClient/DroneFactory/DroneFactoryViewTemplate.hbs
+++ b/src/UI/Settings/DownloadClient/DroneFactory/DroneFactoryViewTemplate.hbs
@@ -1,5 +1,8 @@
 <fieldset class="advanced-setting">
     <legend>Drone Factory Options</legend>
+    <div class="alert alert-warning">
+        Drone Factory is deprecated and should be disabled, use Wanted->Manual Import to manually import arbitrary directories. See <a href="https://github.com/Sonarr/Sonarr/wiki/Health-Checks#drone-factory-is-deprecated">Wiki</a>.
+    </div>
     <div class="form-group">
         <label class="col-sm-3 control-label">Drone Factory</label>