diff --git a/src/NzbDrone.Core.Test/Datastore/Migration/087_pushbullet_devices_channels.cs b/src/NzbDrone.Core.Test/Datastore/Migration/088_pushbullet_devices_channels.cs
similarity index 97%
rename from src/NzbDrone.Core.Test/Datastore/Migration/087_pushbullet_devices_channels.cs
rename to src/NzbDrone.Core.Test/Datastore/Migration/088_pushbullet_devices_channels.cs
index 11d7bb227..cf9b0722e 100644
--- a/src/NzbDrone.Core.Test/Datastore/Migration/087_pushbullet_devices_channels.cs
+++ b/src/NzbDrone.Core.Test/Datastore/Migration/088_pushbullet_devices_channels.cs
@@ -4,8 +4,8 @@ using NUnit.Framework;
 using NzbDrone.Common.Serializer;
 using NzbDrone.Core.Notifications;
 using NzbDrone.Core.Notifications.PushBullet;
-using NzbDrone.Core.Notifications.Pushover;
 using NzbDrone.Core.Test.Framework;
+
 namespace NzbDrone.Core.Test.Datastore.Migration
 {
     [TestFixture]
diff --git a/src/NzbDrone.Core.Test/NzbDrone.Core.Test.csproj b/src/NzbDrone.Core.Test/NzbDrone.Core.Test.csproj
index 59051d732..b1b406d93 100644
--- a/src/NzbDrone.Core.Test/NzbDrone.Core.Test.csproj
+++ b/src/NzbDrone.Core.Test/NzbDrone.Core.Test.csproj
@@ -120,7 +120,7 @@
     <Compile Include="Datastore\Migration\071_unknown_quality_in_profileFixture.cs" />
     <Compile Include="Datastore\Migration\072_history_grabIdFixture.cs" />
     <Compile Include="Datastore\Migration\070_delay_profileFixture.cs" />
-    <Compile Include="Datastore\Migration\087_pushbullet_devices_channels.cs" />
+    <Compile Include="Datastore\Migration\088_pushbullet_devices_channels.cs" />
     <Compile Include="Datastore\Migration\086_pushbullet_device_idsFixture.cs" />
     <Compile Include="Datastore\Migration\085_expand_transmission_urlbaseFixture.cs" />
     <Compile Include="Datastore\Migration\084_update_quality_minmax_sizeFixture.cs" />
diff --git a/src/NzbDrone.Core/Datastore/Migration/087_pushbullet_devices_channels_list.cs b/src/NzbDrone.Core/Datastore/Migration/088_pushbullet_devices_channels_list.cs
similarity index 75%
rename from src/NzbDrone.Core/Datastore/Migration/087_pushbullet_devices_channels_list.cs
rename to src/NzbDrone.Core/Datastore/Migration/088_pushbullet_devices_channels_list.cs
index 7b251f563..052bb4def 100644
--- a/src/NzbDrone.Core/Datastore/Migration/087_pushbullet_devices_channels_list.cs
+++ b/src/NzbDrone.Core/Datastore/Migration/088_pushbullet_devices_channels_list.cs
@@ -8,7 +8,7 @@ using NzbDrone.Core.Datastore.Migration.Framework;
 
 namespace NzbDrone.Core.Datastore.Migration
 {
-    [Migration(87)]
+    [Migration(88)]
     public class pushbullet_devices_channels_list : NzbDroneMigrationBase
     {
         protected override void MainDbUpgrade()
@@ -34,17 +34,25 @@ namespace NzbDrone.Core.Datastore.Migration
                         if (settings.ContainsKey("deviceIds"))
                         {
                             var deviceIdsString = settings.GetValueOrDefault("deviceIds", "") as string;
-                            var deviceIds = deviceIdsString.Split(new[] { "," }, StringSplitOptions.RemoveEmptyEntries);
 
-                            settings["deviceIds"] = deviceIds;
+                            if (deviceIdsString.IsNotNullOrWhiteSpace())
+                            {
+                                var deviceIds = deviceIdsString.Split(new[] { "," }, StringSplitOptions.RemoveEmptyEntries);
+
+                                settings["deviceIds"] = deviceIds;
+                            }
                         }
 
                         if (settings.ContainsKey("channelTags"))
                         {
                             var channelTagsString = settings.GetValueOrDefault("channelTags", "") as string;
-                            var channelTags = channelTagsString.Split(new[] {","}, StringSplitOptions.RemoveEmptyEntries);
 
-                            settings["channelTags"] = channelTags;
+                            if (channelTagsString.IsNotNullOrWhiteSpace())
+                            {
+                                var channelTags = channelTagsString.Split(new[] {","}, StringSplitOptions.RemoveEmptyEntries);
+
+                                settings["channelTags"] = channelTags;
+                            }
                         }
 
                         using (var updateCmd = conn.CreateCommand())
diff --git a/src/NzbDrone.Core/NzbDrone.Core.csproj b/src/NzbDrone.Core/NzbDrone.Core.csproj
index 7224e19c0..7ae3aa44d 100644
--- a/src/NzbDrone.Core/NzbDrone.Core.csproj
+++ b/src/NzbDrone.Core/NzbDrone.Core.csproj
@@ -262,7 +262,7 @@
     <Compile Include="Datastore\Migration\084_update_quality_minmax_size.cs" />
     <Compile Include="Datastore\Migration\083_additonal_blacklist_columns.cs" />
     <Compile Include="Datastore\Migration\082_add_fanzub_settings.cs" />
-    <Compile Include="Datastore\Migration\087_pushbullet_devices_channels_list.cs" />
+    <Compile Include="Datastore\Migration\088_pushbullet_devices_channels_list.cs" />
     <Compile Include="Datastore\Migration\Framework\MigrationContext.cs" />
     <Compile Include="Datastore\Migration\Framework\MigrationController.cs" />
     <Compile Include="Datastore\Migration\Framework\MigrationDbFactory.cs" />