diff --git a/src/DynamoCoreWpf/Services/UsageReportingManager.cs b/src/DynamoCoreWpf/Services/UsageReportingManager.cs
index 4c09d4aae9e..45c340af53f 100644
--- a/src/DynamoCoreWpf/Services/UsageReportingManager.cs
+++ b/src/DynamoCoreWpf/Services/UsageReportingManager.cs
@@ -82,7 +82,8 @@ public void CheckIsFirstRun(Window ownerWindow, IBrandingResourceProvider resour
                 && dynamoViewModel.Model.PreferenceSettings.IsFirstRun
                 && !dynamoViewModel.HideReportOptions
                 && !Analytics.DisableAnalytics
-                && !DynamoModel.IsTestMode)
+                && !DynamoModel.IsTestMode
+                && !dynamoViewModel.Model.NoNetworkMode)
             {
                 //Prompt user for detailed reporting
                 ShowUsageReportingPrompt(ownerWindow);
@@ -99,6 +100,7 @@ public void ToggleIsAnalyticsReportingApproved(object parameter)
                 throw new InvalidOperationException(
                     "DynamoView must be supplied for this command");
             }
+
             ShowUsageReportingPrompt(ownerWindow);
         }
 
diff --git a/src/DynamoCoreWpf/ViewModels/Core/DynamoViewModel.cs b/src/DynamoCoreWpf/ViewModels/Core/DynamoViewModel.cs
index ed37c2367ba..25d17733c10 100644
--- a/src/DynamoCoreWpf/ViewModels/Core/DynamoViewModel.cs
+++ b/src/DynamoCoreWpf/ViewModels/Core/DynamoViewModel.cs
@@ -793,7 +793,7 @@ protected DynamoViewModel(StartConfiguration startConfiguration)
             this.model.CommandCompleted += OnModelCommandCompleted;
             this.model.RequestsCrashPrompt += CrashReportTool.ShowCrashWindow;
 
-            this.HideReportOptions = startConfiguration.HideReportOptions;
+            this.HideReportOptions = startConfiguration.HideReportOptions || model.NoNetworkMode;
             UsageReportingManager.Instance.InitializeCore(this);
             this.WatchHandler = startConfiguration.WatchHandler;
             var pmExtension = model.GetPackageManagerExtension();