diff --git a/core/net/rpl/rpl-icmp6.c b/core/net/rpl/rpl-icmp6.c
index 5531f6100..9ffc61dea 100644
--- a/core/net/rpl/rpl-icmp6.c
+++ b/core/net/rpl/rpl-icmp6.c
@@ -1020,14 +1020,10 @@ dao_input(void)
     goto discard;
   }
 
-  if(instance->mop != RPL_MOP_NON_STORING) {
-    if(RPL_IS_STORING(instance)) {
-      dao_input_storing();
-    }
-  } else {
-    if(RPL_IS_NON_STORING(instance)) {
-      dao_input_nonstoring();
-    }
+  if(RPL_IS_STORING(instance)) {
+    dao_input_storing();
+  } else if(RPL_IS_NON_STORING(instance)) {
+    dao_input_nonstoring();
   }
 
  discard: