diff --git a/plugins-dev/cloud/src/java/pt/lsts/ripples/RipplesUpdater.java b/plugins-dev/cloud/src/java/pt/lsts/ripples/RipplesUpdater.java
index 184f348085..a1678b8b7c 100644
--- a/plugins-dev/cloud/src/java/pt/lsts/ripples/RipplesUpdater.java
+++ b/plugins-dev/cloud/src/java/pt/lsts/ripples/RipplesUpdater.java
@@ -205,10 +205,14 @@ private RipplesPlan pcsToRipplesPlan(PlanControlState pcs) {
             return new RipplesPlan();
         }
         if (!getConsole().getMission().getIndividualPlansList().containsKey(pcs.getPlanId())) {
-            return new RipplesPlan();
+            RipplesPlan plan = new RipplesPlan();
+            if (pcs.getState() != PlanControlState.STATE.READY) {
+                plan.setId(pcs.getPlanId());
+            }
+            return plan;
         }
         PlanType planType = getConsole().getMission().getIndividualPlansList().get(pcs.getPlanId());
-        if (planType == null) {
+        if (planType == null || pcs.getState() == PlanControlState.STATE.READY) {
             return new RipplesPlan();
         }
         ArrayList<double[]> locs = new ArrayList<double[]>();