diff --git a/interface/src/DiscoverabilityManager.cpp b/interface/src/DiscoverabilityManager.cpp
index c4d985419e..6550edff18 100644
--- a/interface/src/DiscoverabilityManager.cpp
+++ b/interface/src/DiscoverabilityManager.cpp
@@ -80,8 +80,7 @@ void DiscoverabilityManager::updateLocation() {
         locationObject.insert(FRIENDS_ONLY_KEY_IN_LOCATION, (_mode.get() == Discoverability::Friends));
 
         // if we have a session ID add it now, otherwise add a null value
-        auto sessionID = accountManager->getSessionID();
-        rootObject[SESSION_ID_KEY] = sessionID.isNull() ? QJsonValue() : sessionID.toString();
+        rootObject[SESSION_ID_KEY] = accountManager->getSessionIDWithoutCurlyBraces();
 
         JSONCallbackParameters callbackParameters;
         callbackParameters.jsonCallbackReceiver = this;
@@ -111,8 +110,7 @@ void DiscoverabilityManager::updateLocation() {
         callbackParameters.jsonCallbackMethod = "handleHeartbeatResponse";
 
         QJsonObject heartbeatObject;
-        auto sessionID = accountManager->getSessionID();
-        heartbeatObject[SESSION_ID_KEY] = sessionID.isNull() ? QJsonValue() : sessionID.toString();
+        heartbeatObject[SESSION_ID_KEY] = accountManager->getSessionIDWithoutCurlyBraces();
 
         accountManager->sendRequest(API_USER_HEARTBEAT_PATH, AccountManagerAuth::Optional,
                                    QNetworkAccessManager::PutOperation, callbackParameters,
diff --git a/libraries/networking/src/AccountManager.h b/libraries/networking/src/AccountManager.h
index c12f663d3e..7a8d2a72fa 100644
--- a/libraries/networking/src/AccountManager.h
+++ b/libraries/networking/src/AccountManager.h
@@ -24,6 +24,8 @@
 
 #include <DependencyManager.h>
 
+#include "UUID.h"
+
 class JSONCallbackParameters {
 public:
     JSONCallbackParameters(QObject* jsonCallbackReceiver = nullptr, const QString& jsonCallbackMethod = QString(),
@@ -86,6 +88,7 @@ public:
 
     static QJsonObject dataObjectFromResponse(QNetworkReply& requestReply);
 
+    QString getSessionIDWithoutCurlyBraces() const { return uuidStringWithoutCurlyBraces(_sessionID); }
     QUuid getSessionID() const { return _sessionID; }
     void setSessionID(const QUuid& sessionID) { _sessionID = sessionID; }