diff --git a/libraries/ui/src/OffscreenUi.cpp b/libraries/ui/src/OffscreenUi.cpp
index 287978bbd3..76ea10c0ac 100644
--- a/libraries/ui/src/OffscreenUi.cpp
+++ b/libraries/ui/src/OffscreenUi.cpp
@@ -658,10 +658,8 @@ void OffscreenUi::createDesktop(const QUrl& url) {
 
 #ifdef DEBUG
     getSurfaceContext()->setContextProperty("DebugQML", QVariant(true));
-    getSurfaceContext()->setContextProperty("DebugQMLFile", QVariant(url.toString()));
-#else 
+#else
     getSurfaceContext()->setContextProperty("DebugQML", QVariant(false));
-    getSurfaceContext()->setContextProperty("DebugQMLFile", QVariant(""));
 #endif
 
     load(url, [=](QQmlContext* context, QObject* newObject) {
diff --git a/libraries/ui/src/ui/OffscreenQmlSurface.cpp b/libraries/ui/src/ui/OffscreenQmlSurface.cpp
index 23a63c8f2a..1047fd1c7e 100644
--- a/libraries/ui/src/ui/OffscreenQmlSurface.cpp
+++ b/libraries/ui/src/ui/OffscreenQmlSurface.cpp
@@ -909,6 +909,12 @@ void OffscreenQmlSurface::loadInternal(const QUrl& qmlSource, bool createNewCont
         finalQmlSource = _qmlContext->resolvedUrl(qmlSource);
     }
 
+#ifdef DEBUG
+    getSurfaceContext()->setContextProperty("DebugQMLFile", QVariant(finalQmlSource.toString()));
+#else
+    getSurfaceContext()->setContextProperty("DebugQMLFile", QVariant(""));
+#endif
+
     auto targetContext = contextForUrl(finalQmlSource, parent, createNewContext);
     auto qmlComponent = new QQmlComponent(_qmlContext->engine(), finalQmlSource, QQmlComponent::PreferSynchronous);
     if (qmlComponent->isLoading()) {