diff --git a/meteor/client/views/dashboard/setup/setup-finish.js b/meteor/client/views/dashboard/setup/setup-finish.js
index 7f4a53c81e..617dd6e08c 100644
--- a/meteor/client/views/dashboard/setup/setup-finish.js
+++ b/meteor/client/views/dashboard/setup/setup-finish.js
@@ -8,7 +8,7 @@ Template.setup_finish.events({
     } else {
       settings.update(settings._id, {
         $set: {
-          tracking: true
+          tracking: enableDiagnostics
         }
       });
     }