diff --git a/src/plugins/qmldesigner/components/edit3d/edit3dview.cpp b/src/plugins/qmldesigner/components/edit3d/edit3dview.cpp
index ca15ec24032..175b081a35a 100644
--- a/src/plugins/qmldesigner/components/edit3d/edit3dview.cpp
+++ b/src/plugins/qmldesigner/components/edit3d/edit3dview.cpp
@@ -316,7 +316,14 @@ void Edit3DView::addQuick3DImport()
         const QList<Import> imports = model()->possibleImports();
         for (const auto &import : imports) {
             if (import.url() == "QtQuick3D") {
-                model()->changeImports({import}, {});
+                if (!import.version().isEmpty() && import.majorVersion() >= 6) {
+                    // Prefer empty version number in Qt6 and beyond
+                    model()->changeImports({Import::createLibraryImport(
+                                                import.url(), {}, import.alias(),
+                                                import.importPaths())}, {});
+                } else {
+                    model()->changeImports({import}, {});
+                }
 
                 // Subcomponent manager update needed to make item library entries appear
                 QmlDesignerPlugin::instance()->currentDesignDocument()
diff --git a/src/plugins/qmldesigner/designercore/model/texttomodelmerger.cpp b/src/plugins/qmldesigner/designercore/model/texttomodelmerger.cpp
index 198efd918dc..7fd8ef1465e 100644
--- a/src/plugins/qmldesigner/designercore/model/texttomodelmerger.cpp
+++ b/src/plugins/qmldesigner/designercore/model/texttomodelmerger.cpp
@@ -2142,7 +2142,7 @@ void TextToModelMerger::collectSemanticErrorsAndWarnings(QList<DocumentMessage>
     for (const Import &import : m_rewriterView->model()->imports()) {
         if (import.isLibraryImport() && import.url() == "QtQuick3D") {
             const QString version = getHighestPossibleImport(import.url());
-            if (Import::majorFromVersion(version) > import.majorVersion()) {
+            if (!import.version().isEmpty() && Import::majorFromVersion(version) > import.majorVersion()) {
                 errors->append(DocumentMessage(
                     QObject::tr(
                         "The selected version of the Qt Quick 3D module is not supported with the selected Qt version.")