diff --git a/scwx-qt/source/scwx/qt/settings/map_settings.cpp b/scwx-qt/source/scwx/qt/settings/map_settings.cpp
index 76c09d30..74b156b5 100644
--- a/scwx-qt/source/scwx/qt/settings/map_settings.cpp
+++ b/scwx-qt/source/scwx/qt/settings/map_settings.cpp
@@ -86,8 +86,10 @@ public:
                }
                else
                {
-                  // TODO: Validate level 3 product
-                  return true;
+                  // Validate level 3 product
+                  const auto level3Product =
+                     common::GetLevel3ProductByAwipsId(value);
+                  return !level3Product.empty() && level3Product != "?";
                }
             });
 
diff --git a/test/data b/test/data
index c68bee74..fd8bc8bf 160000
--- a/test/data
+++ b/test/data
@@ -1 +1 @@
-Subproject commit c68bee74549963e9a02e0fa998efad0f10f8256b
+Subproject commit fd8bc8bf1d07474886ce6773abffab4d315d0cd0