diff --git a/tools/cooja/java/org/contikios/cooja/Simulation.java b/tools/cooja/java/org/contikios/cooja/Simulation.java
index 6cf7777fe..293a4c2c2 100644
--- a/tools/cooja/java/org/contikios/cooja/Simulation.java
+++ b/tools/cooja/java/org/contikios/cooja/Simulation.java
@@ -757,6 +757,7 @@ public class Simulation extends Observable implements Runnable {
     Runnable removeMote = new Runnable() {
       public void run() {
         motes.remove(mote);
+        motesUninit.remove(mote);
         currentRadioMedium.unregisterMote(mote, Simulation.this);
 
         /* Dispose mote interface resources */