diff --git a/src/cmdu.h b/src/cmdu.h
index 19de49a8c405c056007b471563934da6fc95ba8d..bc3d757af294c88ea6e23a7afa3f766bbc976b6a 100644
--- a/src/cmdu.h
+++ b/src/cmdu.h
@@ -39,7 +39,7 @@ struct cmdu_header {
 #define CMDU_SET_LAST_FRAGMENT(c)	(c)->hdr.flag |= 0x80
 #define CMDU_SET_RELAY_MCAST(c)		(c)->hdr.flag |= 0x40
 
-#define CMDU_DEFAULT_TIMEOUT		3000
+#define CMDU_DEFAULT_TIMEOUT		1000
 
 /** struct cmdu_linear - represents a CMDU frame with header and TLVs */
 struct cmdu_linear {
diff --git a/src/cmdufrag.c b/src/cmdufrag.c
index 2a53f1175e003522f55dbc11e32970e4e5bfc0a4..4eec337fcdc29d8a8dc976a19676b9661af266f9 100644
--- a/src/cmdufrag.c
+++ b/src/cmdufrag.c
@@ -425,9 +425,6 @@ struct cmdu_buff *cmdu_defrag(void *rxfq, struct cmdu_buff *lastfrag)
 	}
 	pthread_mutex_unlock(&q->qlock);
 
-	if (!frag)
-		return NULL;
-
 	/* alloc unfragmented cmdu */
 	cmdu = cmdu_alloc_frame(frag->tlen + 3);	/* including EOM */
 	if (!cmdu) {