diff --git a/src/DynamoCoreWpf/Views/PackageManager/Controls/PackageManagerPublishControl.xaml.cs b/src/DynamoCoreWpf/Views/PackageManager/Controls/PackageManagerPublishControl.xaml.cs
index 2be2f14ab27..e19f619b125 100644
--- a/src/DynamoCoreWpf/Views/PackageManager/Controls/PackageManagerPublishControl.xaml.cs
+++ b/src/DynamoCoreWpf/Views/PackageManager/Controls/PackageManagerPublishControl.xaml.cs
@@ -287,6 +287,8 @@ private void mainFrame_Navigated(object sender, System.Windows.Navigation.Naviga
         {
             Page navigatedPage = e.Content as Page;
 
+            if (navigatedPage == null || PublishPages == null || !PublishPages.Any()) return;
+
             PublishPages.Values.ToList().ForEach(page => { page.IsEnabled = false; });
 
             Dispatcher.BeginInvoke((Action)(() =>