diff --git a/wxdata/source/scwx/awips/text_product_message.cpp b/wxdata/source/scwx/awips/text_product_message.cpp
index cccd9e07..541c6806 100644
--- a/wxdata/source/scwx/awips/text_product_message.cpp
+++ b/wxdata/source/scwx/awips/text_product_message.cpp
@@ -354,7 +354,8 @@ void ParseCodedInformation(std::shared_ptr<Segment> segment,
          segment->observed_ = true;
       }
 
-      else if (!segment->tornadoPossible_ && *it == "TORNADO...POSSIBLE")
+      else if (!segment->tornadoPossible_ &&
+               (*it == "TORNADO...POSSIBLE" || *it == "WATERSPOUT...POSSIBLE"))
       {
          segment->tornadoPossible_ = true;
       }