diff --git a/src/plugin/prenote/PendingPrenoteList.cpp b/src/plugin/prenote/PendingPrenoteList.cpp
index 87379ca70..be1d42c4d 100644
--- a/src/plugin/prenote/PendingPrenoteList.cpp
+++ b/src/plugin/prenote/PendingPrenoteList.cpp
@@ -134,11 +134,6 @@ namespace UKControllerPlugin::Prenote {
 
                 // Draw each decision
                 for (const auto& prenote : prenotes) {
-                    auto fp = this->plugin.GetFlightplanForCallsign(prenote->GetCallsign());
-                    if (!fp) {
-                        continue;
-                    }
-
                     // Shift the cols
                     callsignColumn.Y += LINE_HEIGHT;
                     controllerColumn.Y += LINE_HEIGHT;
@@ -157,6 +152,11 @@ namespace UKControllerPlugin::Prenote {
                         this->controllers.FetchPositionById(prenote->GetSendingControllerId())->GetCallsign());
                     graphics.DrawString(controller, controllerColumn, this->textBrush);
 
+                    auto fp = this->plugin.GetFlightplanForCallsign(prenote->GetCallsign());
+                    if (!fp) {
+                        continue;
+                    }
+
                     graphics.DrawString(
                         HelperFunctions::ConvertToWideString(fp->GetOrigin()), airportColumn, this->textBrush);
 
diff --git a/src/plugin/prenote/PendingPrenoteList.h b/src/plugin/prenote/PendingPrenoteList.h
index a8a2b3602..9b84d72c8 100644
--- a/src/plugin/prenote/PendingPrenoteList.h
+++ b/src/plugin/prenote/PendingPrenoteList.h
@@ -81,6 +81,10 @@ namespace UKControllerPlugin::Prenote {
         const Gdiplus::Rect sidColumnHeader{275, 5, 65, 25};
         const Gdiplus::Rect destColumnHeader{350, 5, 40, 25};
 
+        const Gdiplus::Color OFF_WHITE_COLOUR = Gdiplus::Color(255, 255, 255);
+        const Gdiplus::Color TITLE_BAR_BASE_COLOUR = Gdiplus::Color(130, 50, 154);
+        const Gdiplus::Color TITLE_BAR_FLASH_COLOUR = Gdiplus::Color(179, 3, 0);
+
         // Brushes
         const Gdiplus::SolidBrush textBrush;
 
@@ -109,10 +113,6 @@ namespace UKControllerPlugin::Prenote {
         const Gdiplus::Rect CLOSE_BUTTON_OFFSET = {375, 5, 10, 10};
         const Gdiplus::Rect COLLAPSE_BUTTON_OFFSET = {360, 5, 10, 10};
 
-        const Gdiplus::Color OFF_WHITE_COLOUR = Gdiplus::Color(255, 255, 255);
-        const Gdiplus::Color TITLE_BAR_BASE_COLOUR = Gdiplus::Color(130, 50, 154);
-        const Gdiplus::Color TITLE_BAR_FLASH_COLOUR = Gdiplus::Color(179, 3, 0);
-
         // Standard window components
         std::shared_ptr<Components::TitleBar> titleBar;
         std::shared_ptr<Components::Button> closeButton;
diff --git a/src/plugin/releases/DepartureReleaseDecisionList.cpp b/src/plugin/releases/DepartureReleaseDecisionList.cpp
index 8557284b0..356ef93c3 100644
--- a/src/plugin/releases/DepartureReleaseDecisionList.cpp
+++ b/src/plugin/releases/DepartureReleaseDecisionList.cpp
@@ -115,11 +115,6 @@ namespace UKControllerPlugin::Releases {
 
                 // Draw each decision
                 for (const auto& decision : decisions) {
-                    auto fp = this->plugin.GetFlightplanForCallsign(decision->Callsign());
-                    if (!fp) {
-                        continue;
-                    }
-
                     // Shift the cols
                     callsignColumn.Y += lineHeight;
                     controllerColumn.Y += lineHeight;
@@ -136,6 +131,11 @@ namespace UKControllerPlugin::Releases {
                         this->controllers.FetchPositionById(decision->RequestingController())->GetCallsign());
                     graphics.DrawString(controller, controllerColumn, this->textBrush);
 
+                    auto fp = this->plugin.GetFlightplanForCallsign(decision->Callsign());
+                    if (!fp) {
+                        continue;
+                    }
+
                     graphics.DrawString(
                         HelperFunctions::ConvertToWideString(fp->GetOrigin()), airportColumn, this->textBrush);
 
diff --git a/src/plugin/releases/DepartureReleaseDecisionList.h b/src/plugin/releases/DepartureReleaseDecisionList.h
index 6eb832fbc..079514571 100644
--- a/src/plugin/releases/DepartureReleaseDecisionList.h
+++ b/src/plugin/releases/DepartureReleaseDecisionList.h
@@ -71,6 +71,11 @@ namespace UKControllerPlugin::Releases {
         const Gdiplus::Rect airportColumnHeader{225, 5, 40, 25};
         const Gdiplus::Rect sidColumnHeader{275, 5, 65, 25};
 
+        // Some colours
+        const Gdiplus::Color OFF_WHITE_COLOUR = Gdiplus::Color(255, 255, 255);
+        const Gdiplus::Color TITLE_BAR_BASE_COLOUR = Gdiplus::Color(130, 50, 154);
+        const Gdiplus::Color TITLE_BAR_FLASH_COLOUR = Gdiplus::Color(179, 3, 0);
+
         // Brushes
         const Gdiplus::SolidBrush textBrush;
 
@@ -103,11 +108,6 @@ namespace UKControllerPlugin::Releases {
         // Our window position
         Gdiplus::PointF position = {0, 0};
 
-        // Some colours
-        const Gdiplus::Color OFF_WHITE_COLOUR = Gdiplus::Color(255, 255, 255);
-        const Gdiplus::Color TITLE_BAR_BASE_COLOUR = Gdiplus::Color(130, 50, 154);
-        const Gdiplus::Color TITLE_BAR_FLASH_COLOUR = Gdiplus::Color(179, 3, 0);
-
         // Standard window components
         std::shared_ptr<Components::TitleBar> titleBar;
         std::shared_ptr<Components::Button> closeButton;