diff --git a/core/class_db.cpp b/core/class_db.cpp
index 2fd0ee2d899..a2941d70f6c 100644
--- a/core/class_db.cpp
+++ b/core/class_db.cpp
@@ -1410,10 +1410,7 @@ Variant ClassDB::class_get_default_property_value(const StringName &p_class, con
 			cleanup_c = false;
 		} else if (ClassDB::can_instance(p_class)) {
 			c = ClassDB::instance(p_class);
-#ifndef _MSC_VER
-#warning FIXME: ObjectID refactoring broke GDScript handling of reference pointers, this needs a proper fix.
-#endif
-			cleanup_c = (p_class != StringName("GDScript"));
+			cleanup_c = true;
 		}
 
 		if (c) {