diff --git a/sdrbase/pipes/elementpipesgc.h b/sdrbase/pipes/elementpipesgc.h
index 6f8cb9490..db4eafb5e 100644
--- a/sdrbase/pipes/elementpipesgc.h
+++ b/sdrbase/pipes/elementpipesgc.h
@@ -121,7 +121,8 @@ public:
                     QList<Consumer*>& consumers = cIt.value();
 
                     for (int i = 0; i < consumers.size(); i++) {
-                        sendMessageToConsumer(m_elements->operator[](producerKey)[i], producerKey, consumers[i]);
+                        if (existsConsumer(consumers[i]))
+                            sendMessageToConsumer(m_elements->operator[](producerKey)[i], producerKey, consumers[i]);
                     }
                 }
             }
diff --git a/sdrbase/pipes/elementpipesregistrations.h b/sdrbase/pipes/elementpipesregistrations.h
index 7004684d4..d1487d2f7 100644
--- a/sdrbase/pipes/elementpipesregistrations.h
+++ b/sdrbase/pipes/elementpipesregistrations.h
@@ -59,7 +59,7 @@ public:
         }
         else
         {
-            typeId++;
+            typeId = m_typeCount++;
             m_typeIds.insert(type, typeId);
         }