diff --git a/src/App/App.xaml.cs b/src/App/App.xaml.cs
index 16ca60b6b..e6f2e0b85 100644
--- a/src/App/App.xaml.cs
+++ b/src/App/App.xaml.cs
@@ -124,7 +124,6 @@ namespace Bit.App
                 else if(message.Command == "migrated")
                 {
                     await Task.Delay(1000);
-                    SyncIfNeeded();
                     await SetMainPageAsync();
                 }
             });
diff --git a/src/App/Migration/MigrationHelpers.cs b/src/App/Migration/MigrationHelpers.cs
index e3448cc70..eae5d2556 100644
--- a/src/App/Migration/MigrationHelpers.cs
+++ b/src/App/Migration/MigrationHelpers.cs
@@ -40,6 +40,7 @@ namespace Bit.App.Migration
             var environmentService = ServiceContainer.Resolve<IEnvironmentService>("environmentService");
             var passwordGenerationService = ServiceContainer.Resolve<IPasswordGenerationService>(
                 "passwordGenerationService");
+            var syncService = ServiceContainer.Resolve<ISyncService>("syncService");
 
             Log("Migrating 2");
             // Get old data
@@ -189,6 +190,7 @@ namespace Bit.App.Migration
             settingsShim.Remove(Constants.OldUserIdKey);
             Migrating = false;
             messagingService.Send("migrated");
+            var task = Task.Run(() => syncService.FullSyncAsync(true));
             Log("Migrating 11");
             return true;
         }
diff --git a/src/App/Pages/Generator/GeneratorPageViewModel.cs b/src/App/Pages/Generator/GeneratorPageViewModel.cs
index 16934b3e0..76ed3d123 100644
--- a/src/App/Pages/Generator/GeneratorPageViewModel.cs
+++ b/src/App/Pages/Generator/GeneratorPageViewModel.cs
@@ -183,6 +183,10 @@ namespace Bit.App.Pages
             get => _wordSeparator;
             set
             {
+                if(value == null)
+                {
+                    return;
+                }
                 var val = value.Trim();
                 if(SetProperty(ref _wordSeparator, val))
                 {