diff --git a/src/Umbraco.Examine/MediaValueSetBuilder.cs b/src/Umbraco.Examine/MediaValueSetBuilder.cs
index 20c92eb982..3e5b9865cc 100644
--- a/src/Umbraco.Examine/MediaValueSetBuilder.cs
+++ b/src/Umbraco.Examine/MediaValueSetBuilder.cs
@@ -16,16 +16,14 @@ namespace Umbraco.Examine
     {
         private readonly UrlSegmentProviderCollection _urlSegmentProviders;
         private readonly IUserService _userService;
-        private readonly IRuntimeState _runtimeState;
 
         public MediaValueSetBuilder(PropertyEditorCollection propertyEditors,
             UrlSegmentProviderCollection urlSegmentProviders,
-            IUserService userService, IRuntimeState runtimeState)
+            IUserService userService)
             : base(propertyEditors, false)
         {
             _urlSegmentProviders = urlSegmentProviders;
             _userService = userService;
-            _runtimeState = runtimeState;
         }
 
         /// <inheritdoc />
@@ -55,8 +53,9 @@ namespace Umbraco.Examine
 
                 if (!string.IsNullOrEmpty(umbracoFilePath))
                 {
-                var uri = new Uri(_runtimeState.ApplicationUrl.GetLeftPart(UriPartial.Authority) + umbracoFilePath);
-                umbracoFile = uri.Segments.Last();
+                    // intentional dummy Uri
+                    var uri = new Uri("https://localhost/" + umbracoFilePath);
+                    umbracoFile = uri.Segments.Last();
                 }
 
                 var values = new Dictionary<string, IEnumerable<object>>
diff --git a/src/Umbraco.Tests/UmbracoExamine/IndexInitializer.cs b/src/Umbraco.Tests/UmbracoExamine/IndexInitializer.cs
index 5c9c965cd1..6c65ae8345 100644
--- a/src/Umbraco.Tests/UmbracoExamine/IndexInitializer.cs
+++ b/src/Umbraco.Tests/UmbracoExamine/IndexInitializer.cs
@@ -45,21 +45,10 @@ namespace Umbraco.Tests.UmbracoExamine
 
         public static MediaIndexPopulator GetMediaIndexRebuilder(PropertyEditorCollection propertyEditors, IMediaService mediaService)
         {
-            var mediaValueSetBuilder = new MediaValueSetBuilder(propertyEditors, new UrlSegmentProviderCollection(new[] { new DefaultUrlSegmentProvider() }), GetMockUserService(), MockRuntimeState(RuntimeLevel.Run));
+            var mediaValueSetBuilder = new MediaValueSetBuilder(propertyEditors, new UrlSegmentProviderCollection(new[] { new DefaultUrlSegmentProvider() }), GetMockUserService());
             var mediaIndexDataSource = new MediaIndexPopulator(null, mediaService, mediaValueSetBuilder);
             return mediaIndexDataSource;
         }
-
-        public static IRuntimeState MockRuntimeState(RuntimeLevel level)
-        {
-            var runtimeState = Mock.Of<IRuntimeState>();
-            Mock.Get(runtimeState).Setup(x => x.Level).Returns(level);
-            Mock.Get(runtimeState).SetupGet(m => m.ApplicationUrl).Returns(new Uri("https://localhost/umbraco"));
-
-            return runtimeState;
-        }
-
-
         public static IContentService GetMockContentService()
         {
             long longTotalRecs;