diff --git a/src/plugins/qmldesigner/components/edit3d/bakelightsdatamodel.cpp b/src/plugins/qmldesigner/components/edit3d/bakelightsdatamodel.cpp
index 95a260c26fd..a1dfcc8f981 100644
--- a/src/plugins/qmldesigner/components/edit3d/bakelightsdatamodel.cpp
+++ b/src/plugins/qmldesigner/components/edit3d/bakelightsdatamodel.cpp
@@ -15,6 +15,8 @@
 #include "qmlobjectnode.h"
 #include "variantproperty.h"
 
+#include <model/modelutils.h>
+
 #include <utils3d.h>
 
 #include <utils/expected.h>
@@ -292,7 +294,7 @@ bool BakeLightsDataModel::reset()
 
             if (!hasExposedProps && node.metaInfo().isFileComponent()
                 && node.metaInfo().isQtQuick3DNode()) {
-                const QString compFile = node.metaInfo().componentFileName();
+                const QString compFile = ModelUtils::componentFilePath(node);
                 const QString projPath = m_view->externalDependencies().currentProjectDirPath();
                 if (compFile.startsWith(projPath)) {
                     // Quick and dirty scan of the component source to check if it potentially has
diff --git a/src/plugins/qmldesigner/designercore/include/nodemetainfo.h b/src/plugins/qmldesigner/designercore/include/nodemetainfo.h
index 648c4be9a82..ba2e2cda65e 100644
--- a/src/plugins/qmldesigner/designercore/include/nodemetainfo.h
+++ b/src/plugins/qmldesigner/designercore/include/nodemetainfo.h
@@ -27,9 +27,11 @@ QT_END_NAMESPACE
 #  define DEPRECATED_VERSION_NUMBER \
       [[deprecated( \
           "In most cases you don't need them anymore because the import is setting them!")]]
+#  define DEPRECATED_COMPONENT_FILE_NAME [[deprecated("Use sourceId() instead.")]]
 #else
 #  define DEPRECATED_TYPENAME
 #  define DEPRECATED_VERSION_NUMBER
+#  define DEPRECATED_COMPONENT_FILE_NAME
 #endif
 
 namespace QmlDesigner {
@@ -116,7 +118,7 @@ public:
     Storage::Info::ItemLibraryEntries itemLibrariesEntries() const;
 
     SourceId sourceId() const;
-    QString componentFileName() const;
+    DEPRECATED_COMPONENT_FILE_NAME QString componentFileName() const;
 
     bool isBasedOn(const NodeMetaInfo &metaInfo) const;
     bool isBasedOn(const NodeMetaInfo &metaInfo1, const NodeMetaInfo &metaInfo2) const;
diff --git a/src/plugins/qmldesigner/designercore/model/modelutils.cpp b/src/plugins/qmldesigner/designercore/model/modelutils.cpp
index 3dd7fe6c32a..6c3e1ea50f5 100644
--- a/src/plugins/qmldesigner/designercore/model/modelutils.cpp
+++ b/src/plugins/qmldesigner/designercore/model/modelutils.cpp
@@ -109,19 +109,19 @@ PropertyMetaInfo metainfo(const ModelNode &node, const PropertyName &propertyNam
     return node.metaInfo().property(propertyName);
 }
 
-QString componentFilePath(const PathCacheType &pathCache, const NodeMetaInfo &metaInfo)
+QString componentFilePath([[maybe_unused]] const PathCacheType &pathCache, const NodeMetaInfo &metaInfo)
 {
-    if constexpr (useProjectStorage()) {
-        auto typeSourceId = metaInfo.sourceId();
+#ifdef QDS_USE_PROJECTSTORAGE
+    auto typeSourceId = metaInfo.sourceId();
 
-        if (typeSourceId && metaInfo.isFileComponent()) {
-            return pathCache.sourcePath(typeSourceId).toQString();
-        }
-    } else {
-        return metaInfo.componentFileName();
+    if (typeSourceId && metaInfo.isFileComponent()) {
+        return pathCache.sourcePath(typeSourceId).toQString();
     }
 
     return {};
+#else
+    return metaInfo.componentFileName();
+#endif
 }
 
 QString componentFilePath(const ModelNode &node)
diff --git a/src/plugins/qmldesigner/documentmanager.cpp b/src/plugins/qmldesigner/documentmanager.cpp
index b94de22c289..6d4deb527aa 100644
--- a/src/plugins/qmldesigner/documentmanager.cpp
+++ b/src/plugins/qmldesigner/documentmanager.cpp
@@ -130,7 +130,7 @@ static void openComponentSourcePropertyOfLoader(const ModelNode &modelNode)
     }
 
     Core::EditorManager::openEditor(FilePath::fromString(
-                                        componentModelNode.metaInfo().componentFileName()),
+                                        ModelUtils::componentFilePath(componentModelNode)),
                                     Utils::Id(),
                                     Core::EditorManager::DoNotMakeVisible);
 }