diff --git a/src/main/kotlin/application/controller/DataPanelController.kt b/src/main/kotlin/application/controller/DataPanelController.kt
index 5b2f5f1..f0c6fa3 100644
--- a/src/main/kotlin/application/controller/DataPanelController.kt
+++ b/src/main/kotlin/application/controller/DataPanelController.kt
@@ -91,7 +91,7 @@ class DataPanelController : Initializable, SelectedVesselListener {
     }
 
     private fun plot() {
-        if (selectedItem != null || observableSelectedVessel.value == Vessel(null)) {
+        if (selectedItem != null && observableSelectedVessel.value.messages.size != 0) {
             GlobalScope.launch {
                 plot(selectedItem)
             }