diff --git a/src/Akka.Hosting.TestKit.Tests/DiPropsFailTest.cs b/src/Akka.Hosting.TestKit.Tests/DiPropsFailTest.cs
new file mode 100644
index 0000000..717dd8c
--- /dev/null
+++ b/src/Akka.Hosting.TestKit.Tests/DiPropsFailTest.cs
@@ -0,0 +1,46 @@
+// -----------------------------------------------------------------------
+//  <copyright file="DiPropsFailTest.cs" company="Akka.NET Project">
+//      Copyright (C) 2013-2023 .NET Foundation <https://github.com/akkadotnet/akka.net>
+//  </copyright>
+// -----------------------------------------------------------------------
+
+using System;
+using Akka.Actor;
+using Akka.DependencyInjection;
+using Microsoft.Extensions.Logging;
+using Xunit;
+using Xunit.Abstractions;
+
+namespace Akka.Hosting.TestKit.Tests;
+
+// Regression test for https://github.com/akkadotnet/Akka.Hosting/issues/343
+public class DiPropsFailTest: TestKit
+{
+    public DiPropsFailTest(ITestOutputHelper output) : base(nameof(DiPropsFailTest), output)
+    {}
+    
+    protected override void ConfigureAkka(AkkaConfigurationBuilder builder, IServiceProvider provider)
+    { }
+
+    [Fact]
+    public void DiTest()
+    {
+        var actor = Sys.ActorOf(NonRootActorWithDi.Props());
+        actor.Tell("test");
+        ExpectMsg<string>("test");
+    }
+    
+    private class NonRootActorWithDi: ReceiveActor
+    {
+        public static Props Props() => DependencyResolver.For(Context.System).Props<NonRootActorWithDi>();
+        
+        public NonRootActorWithDi(ILogger<NonRootActorWithDi> log)
+        {
+            ReceiveAny(msg =>
+            {
+                log.LogInformation("Received {Msg}", msg);
+                Sender.Tell(msg);
+            });
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/Akka.Hosting.TestKit/ActorCellKeepingSynchronizationContext.cs b/src/Akka.Hosting.TestKit/ActorCellKeepingSynchronizationContext.cs
deleted file mode 100644
index 004351d..0000000
--- a/src/Akka.Hosting.TestKit/ActorCellKeepingSynchronizationContext.cs
+++ /dev/null
@@ -1,83 +0,0 @@
-//-----------------------------------------------------------------------
-// <copyright file="ActorCellKeepingSynchronizationContext.cs" company="Akka.NET Project">
-//     Copyright (C) 2009-2021 Lightbend Inc. <http://www.lightbend.com>
-//     Copyright (C) 2013-2021 .NET Foundation <https://github.com/akkadotnet/akka.net>
-// </copyright>
-//-----------------------------------------------------------------------
-
-using System;
-using System.Threading;
-using System.Threading.Tasks;
-using Akka.Actor;
-using Akka.Actor.Internal;
-
-namespace Akka.Hosting.TestKit
-{
-    /// <summary>
-    /// TBD
-    /// </summary>
-    class ActorCellKeepingSynchronizationContext : SynchronizationContext
-    {
-        private readonly ActorCell _cell;
-        
-        internal static ActorCell? AsyncCache { get; set; }
-
-        /// <summary>
-        /// TBD
-        /// </summary>
-        /// <param name="cell">TBD</param>
-        public ActorCellKeepingSynchronizationContext(ActorCell cell)
-        {
-            _cell = cell;
-        }
-
-        /// <summary>
-        /// TBD
-        /// </summary>
-        /// <param name="d">TBD</param>
-        /// <param name="state">TBD</param>
-        public override void Post(SendOrPostCallback d, object state)
-        {
-            ThreadPool.QueueUserWorkItem(_ =>
-            {
-                var oldCell = InternalCurrentActorCellKeeper.Current;
-                var oldContext = Current;
-                SetSynchronizationContext(this);
-                InternalCurrentActorCellKeeper.Current = AsyncCache ?? _cell;
-
-                try
-                {
-                    d(state);
-                }
-                finally
-                {
-                    InternalCurrentActorCellKeeper.Current = oldCell;
-                    SetSynchronizationContext(oldContext);
-                }
-            }, state);
-        }
-
-        /// <summary>
-        /// TBD
-        /// </summary>
-        /// <param name="d">TBD</param>
-        /// <param name="state">TBD</param>
-        public override void Send(SendOrPostCallback d, object state)
-        {
-            var tcs = new TaskCompletionSource<int>();
-            Post(_ =>
-            {
-                try
-                {
-                    d(state);
-                    tcs.SetResult(0);
-                }
-                catch (Exception e)
-                {
-                    tcs.TrySetException(e);
-                }
-            }, state);
-            tcs.Task.Wait();
-        }
-    }
-}
diff --git a/src/Akka.Hosting.TestKit/TestKit.cs b/src/Akka.Hosting.TestKit/TestKit.cs
index ad7818a..6759397 100644
--- a/src/Akka.Hosting.TestKit/TestKit.cs
+++ b/src/Akka.Hosting.TestKit/TestKit.cs
@@ -8,6 +8,7 @@
 using System.Threading;
 using System.Threading.Tasks;
 using Akka.Actor;
+using Akka.Actor.Internal;
 using Akka.Actor.Setup;
 using Akka.Annotations;
 using Akka.Configuration;
@@ -53,7 +54,7 @@ public IHost Host
         public ITestOutputHelper? Output { get; }
         public LogLevel LogLevel { get; }
 
-        private TaskCompletionSource<Done> _initialized = new TaskCompletionSource<Done>();
+        private readonly TaskCompletionSource<Done> _initialized = new TaskCompletionSource<Done>();
 
         protected TestKit(string? actorSystemName = null, ITestOutputHelper? output = null, TimeSpan? startupTimeout = null, LogLevel logLevel = LogLevel.Information)
         : base(Assertions)
@@ -102,8 +103,15 @@ private void InternalConfigureServices(HostBuilderContext context, IServiceColle
 
                 builder.AddStartup((system, _) =>
                 {
-                    base.InitializeTest(system, (ActorSystemSetup)null!, null, null);
-                    _initialized.SetResult(Done.Instance);
+                    try
+                    {
+                        base.InitializeTest(system, (ActorSystemSetup)null!, null, null);
+                        _initialized.SetResult(Done.Instance);
+                    }
+                    catch (Exception e)
+                    {
+                        _initialized.SetException(e);
+                    }
                 });
             });
         }
@@ -154,6 +162,10 @@ public async Task InitializeAsync()
             }
 
             await _initialized.Task;
+            
+            if (this is not INoImplicitSender && InternalCurrentActorCellKeeper.Current is null)
+                InternalCurrentActorCellKeeper.Current = (ActorCell)((ActorRefWithCell)TestActor).Underlying;
+            
             await BeforeTestStart();
         }