diff --git a/interface/src/Application.cpp b/interface/src/Application.cpp
index fb7d6a4a0f..41d29b8735 100644
--- a/interface/src/Application.cpp
+++ b/interface/src/Application.cpp
@@ -1445,8 +1445,6 @@ Application::Application(int& argc, char** argv, QElapsedTimer& startupTimer, bo
     // add firstRun flag from settings to launch event
     Setting::Handle<bool> firstRun { Settings::firstRun, true };
 
-    QString machineFingerPrint = uuidStringWithoutCurlyBraces(FingerprintUtils::getMachineFingerprint());
-
     auto& userActivityLogger = UserActivityLogger::getInstance();
     if (userActivityLogger.isEnabled()) {
         // sessionRunTime will be reset soon by loadSettings. Grab it now to get previous session value.
@@ -1498,13 +1496,12 @@ Application::Application(int& argc, char** argv, QElapsedTimer& startupTimer, bo
         properties["first_run"] = firstRun.get();
 
         // add the user's machine ID to the launch event
+        QString machineFingerPrint = uuidStringWithoutCurlyBraces(FingerprintUtils::getMachineFingerprint());
         properties["machine_fingerprint"] = machineFingerPrint;
 
         userActivityLogger.logAction("launch", properties);
     }
 
-    setCrashAnnotation("machine_fingerprint", machineFingerPrint.toStdString());
-
     _entityEditSender.setMyAvatar(myAvatar.get());
 
     // The entity octree will have to know about MyAvatar for the parentJointName import
diff --git a/interface/src/CrashHandler_Breakpad.cpp b/interface/src/CrashHandler_Breakpad.cpp
index c11e0e2a12..60e6ed0297 100644
--- a/interface/src/CrashHandler_Breakpad.cpp
+++ b/interface/src/CrashHandler_Breakpad.cpp
@@ -23,8 +23,9 @@
 #include <QtCore/QFileInfo>
 #include <QtAndroidExtras/QAndroidJniObject>
 
-#include <SettingHelpers.h>
 #include <BuildInfo.h>
+#include <FingerprintUtils.h>
+#include <SettingHelpers.h>
 
 google_breakpad::ExceptionHandler* gBreakpadHandler;
 
@@ -60,6 +61,9 @@ bool startCrashHandler(std::string appPath) {
     annotations["build_number"] = BuildInfo::BUILD_NUMBER;
     annotations["build_type"] = BuildInfo::BUILD_TYPE_STRING;
 
+    auto machineFingerPrint = uuidStringWithoutCurlyBraces(FingerprintUtils::getMachineFingerprint());
+    annotations["machine_fingerprint"] = machineFingerPrint.toStdString();
+
     flushAnnotations();
 
     gBreakpadHandler = new google_breakpad::ExceptionHandler(
diff --git a/interface/src/CrashHandler_Crashpad.cpp b/interface/src/CrashHandler_Crashpad.cpp
index 7729ced702..abe0609263 100644
--- a/interface/src/CrashHandler_Crashpad.cpp
+++ b/interface/src/CrashHandler_Crashpad.cpp
@@ -34,6 +34,8 @@
 #pragma clang diagnostic pop
 
 #include <BuildInfo.h>
+#include <FingerprintUtils.h>
+#include <UUID.h>
 
 using namespace crashpad;
 
@@ -83,6 +85,10 @@ bool startCrashHandler(std::string appPath) {
     annotations["build_number"] = BuildInfo::BUILD_NUMBER.toStdString();
     annotations["build_type"] = BuildInfo::BUILD_TYPE_STRING.toStdString();
 
+    auto machineFingerPrint = uuidStringWithoutCurlyBraces(FingerprintUtils::getMachineFingerprint());
+    annotations["machine_fingerprint"] = machineFingerPrint.toStdString();
+
+
     arguments.push_back("--no-rate-limit");
 
     // Setup Crashpad DB directory
@@ -123,14 +129,16 @@ bool startCrashHandler(std::string appPath) {
 }
 
 void setCrashAnnotation(std::string name, std::string value) {
-    std::lock_guard<std::mutex> guard(annotationMutex);
-    if (!crashpadAnnotations) {
-        crashpadAnnotations = new crashpad::SimpleStringDictionary(); // don't free this, let it leak
-        crashpad::CrashpadInfo* crashpad_info = crashpad::CrashpadInfo::GetCrashpadInfo();
-        crashpad_info->set_simple_annotations(crashpadAnnotations);
+    if (client) {
+        std::lock_guard<std::mutex> guard(annotationMutex);
+        if (!crashpadAnnotations) {
+            crashpadAnnotations = new crashpad::SimpleStringDictionary(); // don't free this, let it leak
+            crashpad::CrashpadInfo* crashpad_info = crashpad::CrashpadInfo::GetCrashpadInfo();
+            crashpad_info->set_simple_annotations(crashpadAnnotations);
+        }
+        std::replace(value.begin(), value.end(), ',', ';');
+        crashpadAnnotations->SetKeyValue(name, value);
     }
-    std::replace(value.begin(), value.end(), ',', ';');
-    crashpadAnnotations->SetKeyValue(name, value);
 }
 
 #endif