diff --git a/CHANGES.html b/CHANGES.html
index 5ed2eec3f..779195ac2 100644
--- a/CHANGES.html
+++ b/CHANGES.html
@@ -63,6 +63,8 @@ us a note on ns-developers mailing list.</p>
 <li>Added a new trace source <b>EndOfHePreamble</b> in WifiPhy for tracing end of preamble (after training fields) for received 802.11ax packets.</li>
 <li>Added a new helper method to SpectrumWifiPhyHelper and YansWifiPhyHelper to set the frame capture model</li>
 <li>Added a new helper method to SpectrumWifiPhyHelper and YansWifiPhyHelper to set the preamble detection model</li>
+<li>Added a method to ObjectFactory to check whether a TypeId has been configured on the factory</li>
+</ul>
 </ul>
 <h2>Changes to existing API:</h2>
 <ul>
diff --git a/src/core/model/object-factory.cc b/src/core/model/object-factory.cc
index 5d541f3f6..09e14acd8 100644
--- a/src/core/model/object-factory.cc
+++ b/src/core/model/object-factory.cc
@@ -60,6 +60,15 @@ ObjectFactory::SetTypeId (const char *tid)
   NS_LOG_FUNCTION (this << tid);
   m_tid = TypeId::LookupByName (tid);
 }
+bool
+ObjectFactory::IsTypeIdSet (void) const
+{
+  if (m_tid.GetUid () != 0)
+    {
+      return true;
+    }
+  return false;
+}
 void
 ObjectFactory::Set (std::string name, const AttributeValue &value)
 {
diff --git a/src/core/model/object-factory.h b/src/core/model/object-factory.h
index 01e0d4a0b..30a20681d 100644
--- a/src/core/model/object-factory.h
+++ b/src/core/model/object-factory.h
@@ -72,6 +72,13 @@ public:
   void SetTypeId (std::string tid);
   /**@}*/
   
+  /**
+   * Check if the ObjectFactory has been configured with a TypeId 
+   *
+   * \return true if a TypeId has been configured to the ObjectFactory
+   */
+  bool IsTypeIdSet (void) const;
+
   /**
    * Set an attribute to be set during construction.
    *