diff --git a/interface/src/Application.cpp b/interface/src/Application.cpp
index 928d5db6cd..bd69934b27 100644
--- a/interface/src/Application.cpp
+++ b/interface/src/Application.cpp
@@ -3591,7 +3591,7 @@ void Application::setPreferAvatarFingerOverStylus(bool value) {
 
 void Application::setPreferredCursor(const QString& cursorName) {
     qCDebug(interfaceapp) << "setPreferredCursor" << cursorName;
-    _preferredCursor.set(cursorName.isEmpty() ? DEFAULT_CURSOR_NAME : cursorName);
+    _preferredCursor.set(cursorName.isEmpty() ? Cursor::Manager::getIconName(Cursor::Icon::SYSTEM) : cursorName);
     showCursor(Cursor::Manager::lookupIcon(_preferredCursor.get()));
 }
 
@@ -5041,11 +5041,8 @@ void Application::idle() {
         }
     }
 #endif
-
     
-    if((displayPlugin && displayPlugin->isHmd()) ||  _preferredCursor.get() ==  Cursor::Manager::ICON_NAMES[Cursor::Icon::RETICLE]){
-        checkChangeCursor();
-    }
+    checkChangeCursor();
 
 #if !defined(DISABLE_QML)
     auto stats = Stats::getInstance();
diff --git a/libraries/display-plugins/src/display-plugins/OpenGLDisplayPlugin.cpp b/libraries/display-plugins/src/display-plugins/OpenGLDisplayPlugin.cpp
index f4f2bdabff..1e742bb8a8 100644
--- a/libraries/display-plugins/src/display-plugins/OpenGLDisplayPlugin.cpp
+++ b/libraries/display-plugins/src/display-plugins/OpenGLDisplayPlugin.cpp
@@ -683,7 +683,7 @@ void OpenGLDisplayPlugin::compositeLayers() {
     }
 
      auto& cursorManager = Cursor::Manager::instance();
-    if (isHmd() || cursorManager.getCursor()->getIcon() == Cursor::RETICLE ) {
+    if (isHmd() || cursorManager.getCursor()->getIcon() == Cursor::RETICLE) {
         auto compositorHelper = DependencyManager::get<CompositorHelper>();
         // Draw the pointer last so it's on top of everything
         if (compositorHelper->getReticleVisible()) {