diff --git a/dtool/src/dtoolbase/typeRegistry.I b/dtool/src/dtoolbase/typeRegistry.I
index 0eb0b070c8..ae7a025b94 100644
--- a/dtool/src/dtoolbase/typeRegistry.I
+++ b/dtool/src/dtoolbase/typeRegistry.I
@@ -39,7 +39,7 @@ freshen_derivations() {
 ////////////////////////////////////////////////////////////////////
 INLINE void TypeRegistry::
 init_lock() {
-  if (_lock == (MutexImpl *)NULL) {
-    _lock = new MutexImpl;
+  if (_lock == (ReMutexImpl *)NULL) {
+    _lock = new ReMutexImpl;
   }
 }
diff --git a/dtool/src/dtoolbase/typeRegistry.cxx b/dtool/src/dtoolbase/typeRegistry.cxx
index 69d0a61ddb..4407b91622 100644
--- a/dtool/src/dtoolbase/typeRegistry.cxx
+++ b/dtool/src/dtoolbase/typeRegistry.cxx
@@ -25,7 +25,7 @@
 
 #include <algorithm>
 
-MutexImpl *TypeRegistry::_lock = NULL;
+ReMutexImpl *TypeRegistry::_lock = NULL;
 TypeRegistry *TypeRegistry::_global_pointer = NULL;
 
 ////////////////////////////////////////////////////////////////////
diff --git a/dtool/src/dtoolbase/typeRegistry.h b/dtool/src/dtoolbase/typeRegistry.h
index a11d550943..2332c91723 100644
--- a/dtool/src/dtoolbase/typeRegistry.h
+++ b/dtool/src/dtoolbase/typeRegistry.h
@@ -111,7 +111,7 @@ private:
 
   bool _derivations_fresh;
 
-  static MutexImpl *_lock;
+  static ReMutexImpl *_lock;
   static TypeRegistry *_global_pointer;
 
   friend class TypeHandle;