diff --git a/indra/newview/fspanelface.cpp b/indra/newview/fspanelface.cpp
index 5ec5738064..39becffb47 100644
--- a/indra/newview/fspanelface.cpp
+++ b/indra/newview/fspanelface.cpp
@@ -1122,10 +1122,10 @@ LLMaterialPtr FSPanelFace::createDefaultMaterial(LLMaterialPtr current_material)
 
 void FSPanelFace::onVisibilityChange(bool new_visibility)
 {
-    if (new_visibility)
+    /* if (new_visibility)
     {
         gAgent.showLatestFeatureNotification("gltf");
-    }
+    } */
     LLPanel::onVisibilityChange(new_visibility);
 
     // Since we allow both PBR and BP textures to be applied at the same time,
diff --git a/indra/newview/llagent.cpp b/indra/newview/llagent.cpp
index c77d1b7493..d7a8dc0a22 100644
--- a/indra/newview/llagent.cpp
+++ b/indra/newview/llagent.cpp
@@ -719,6 +719,13 @@ void LLAgent::showLatestFeatureNotification(const std::string key)
             flag = 4;
         }
 
+        // <FS:PP> FIRE-35931 Guard against empty "new feature" popup
+        if (flag == 0)
+        {
+            return;
+        }
+        // </FS:PP>
+
         if ((flags & flag) == 0)
         {
             // Need to open on top even if called from onOpen,