diff --git a/libraries/ui/src/ui/types/ContextAwareProfile.cpp b/libraries/ui/src/ui/types/ContextAwareProfile.cpp
index 0374de87ff..ef17ad7229 100644
--- a/libraries/ui/src/ui/types/ContextAwareProfile.cpp
+++ b/libraries/ui/src/ui/types/ContextAwareProfile.cpp
@@ -38,12 +38,12 @@ RestrictedContextMonitor::TSharedPointer RestrictedContextMonitor::getMonitor(QQ
     gl_monitorMapProtect.lock();
     TMonitorMap::const_iterator lookup = gl_monitorMap.find(context);
     if (lookup != gl_monitorMap.end()) {
-        monitor = lookup->second.lock();
+        monitor = lookup.value().lock();
         assert(monitor);
     } else if(createIfMissing) {
         monitor = TSharedPointer::create(context);
         monitor->_selfPointer = monitor;
-        gl_monitorMap.insert(TMonitorMap::value_type(context, monitor));
+        gl_monitorMap.insert(context, monitor);
     }
     gl_monitorMapProtect.unlock();
     return monitor;
diff --git a/libraries/ui/src/ui/types/ContextAwareProfile.h b/libraries/ui/src/ui/types/ContextAwareProfile.h
index ec0590eda5..99fee8112d 100644
--- a/libraries/ui/src/ui/types/ContextAwareProfile.h
+++ b/libraries/ui/src/ui/types/ContextAwareProfile.h
@@ -12,6 +12,7 @@
 #define hifi_ContextAwareProfile_h
 
 #include <QtCore/QtGlobal>
+#include <QtCore/QMap>
 #include <QtCore/QMutex>
 #include <QtCore/QSharedPointer>
 
@@ -53,7 +54,7 @@ public:
     bool _isUninitialized{ true };
 
 private:
-    typedef std::map<QQmlContext*, TWeakPointer> TMonitorMap;
+    typedef QMap<QQmlContext*, TWeakPointer> TMonitorMap;
 
     static QMutex gl_monitorMapProtect;
     static TMonitorMap gl_monitorMap;