diff --git a/data/config/TCPairsConfig_default b/data/config/TCPairsConfig_default
index e6685c413d..85a71cc97f 100644
--- a/data/config/TCPairsConfig_default
+++ b/data/config/TCPairsConfig_default
@@ -150,7 +150,7 @@ diag_info_map = [
    },
    { 
       diag_source    = "SHIPS_DIAG_RT";
-      track_source   = "OFCL";
+      track_source   = "SHIPS_TRK";
       field_source   = "GFS_0p50";
       match_to_track = [ "OFCL" ];
       diag_name      = [];
diff --git a/docs/Users_Guide/tc-pairs.rst b/docs/Users_Guide/tc-pairs.rst
index 05c6f837d0..3e1cce3d8e 100644
--- a/docs/Users_Guide/tc-pairs.rst
+++ b/docs/Users_Guide/tc-pairs.rst
@@ -35,7 +35,7 @@ As of MET v11.0.0, two types of TC diagnostics are supported in TC-Pairs:
 
   .. SHIPS_DIAG_DEV: Includes a plethora of inner core, environmental, oceanic, and satellite-based diagnostics. These diagnostics are computed using the *perfect prog* approach.
 
-  * SHIPS_DIAG_RT: Real-time SHIPS diagnostics computed from a NWP model such as the Global Forecast System (GFS) model along the NHC Official forecast track.
+  * SHIPS_DIAG_RT: Real-time SHIPS diagnostics computed from a NWP model such as the Global Forecast System (GFS) model along a GFS forecast track defined by the SHIPS model itself. Note that the SHIPS-derived forecast track does not appear in NHC adeck data.
 
   * CIRA_DIAG_RT: Real-time model-based diagnostics computed along the model's predicted track.
 
@@ -295,7 +295,7 @@ ____________________
     },
     {
        diag_source    = "SHIPS_DIAG_RT";
-       track_source   = "OFCL";
+       track_source   = "SHIPS_TRK";
        field_source   = "GFS_0p50";
        match_to_track = [ "OFCL" ];
        diag_name      = [];
diff --git a/src/libcode/vx_tc_util/track_info.cc b/src/libcode/vx_tc_util/track_info.cc
index 7bad88f006..f99d95cf3e 100644
--- a/src/libcode/vx_tc_util/track_info.cc
+++ b/src/libcode/vx_tc_util/track_info.cc
@@ -573,12 +573,21 @@ bool TrackInfo::add_diag_data(DiagFile &diag_file, const StringArray &req_diag_n
          if(i_name == 0) {
             if(!is_eq(diag_file.lat(i_time), Point[i_pnt].lat()) ||
                !is_eq(diag_file.lon(i_time), Point[i_pnt].lon())) {
-               mlog << Warning << "\nTrackInfo::add_diag_data() -> "
-                    << "the " << StormId << " " << Technique << " " << unix_to_yyyymmddhh(InitTime)
+               ConcatString cs;
+               cs << "The " << StormId << " " << Technique << " " << unix_to_yyyymmddhh(InitTime)
                     << " lead time " << sec_to_timestring(diag_file.lead(i_time))
                     << " track location (" << Point[i_pnt].lat() << ", "
-                    << Point[i_pnt].lon() << ") does not match the diagnostic location ("
-                    << diag_file.lat(i_time) << ", " << diag_file.lon(i_time) << ")\n";
+                    << Point[i_pnt].lon() << ") does not match the "
+                    << diagtype_to_string(DiagSource) << " diagnostic location ("
+                    << diag_file.lat(i_time) << ", " << diag_file.lon(i_time) << ")";
+
+               // Print a warning if the TrackSource and Technique match
+               if(TrackSource == Technique) {
+                  mlog << Warning << "\nTrackInfo::add_diag_data() -> " << cs << "\n\n";
+               }
+               else {
+                  mlog << Debug(4) << cs << "\n";
+               }
             }
          }