diff --git a/src/AutoDialer.cs b/src/AutoDialer.cs
index 579e9d0..ce433b7 100644
--- a/src/AutoDialer.cs
+++ b/src/AutoDialer.cs
@@ -68,6 +68,9 @@ public void Dispose()
         /// <value>
         ///   Defaults to <see cref="DefaultMinConnections"/>.
         /// </value>
+        /// <remarks>
+        ///   Setting this to zero will basically disable the auto dial features.
+        /// </remarks>
         public int MinConnections { get; set; } = DefaultMinConnections;
 
         /// <summary>
@@ -85,7 +88,7 @@ public void Dispose()
         /// </remarks>
         void OnPeerDiscovered(object sender, Peer peer)
         {
-            if (swarm.Manager.Connections.Count() < MinConnections)
+            if (swarm.IsRunning && swarm.Manager.Connections.Count() < MinConnections)
             {
                 Task.Run(async () =>
                 {
diff --git a/src/Swarm.cs b/src/Swarm.cs
index 9127037..07bb328 100644
--- a/src/Swarm.cs
+++ b/src/Swarm.cs
@@ -11,11 +11,8 @@
 using System.IO;
 using System.Net.NetworkInformation;
 using System.Net.Sockets;
-using System.Reflection;
 using PeerTalk.Protocols;
 using PeerTalk.Cryptography;
-using PeerTalk.Discovery;
-using PeerTalk.Routing;
 using Ipfs.CoreApi;
 
 namespace PeerTalk
@@ -119,6 +116,16 @@ public Peer LocalPeer
         /// </summary>
         public INetworkProtector NetworkProtector { get; set; }
 
+        /// <summary>
+        ///   Determines if the swarm has been started.
+        /// </summary>
+        /// <value>
+        ///   <b>true</b> if the swarm has started; otherwise, <b>false</b>.
+        /// </value>
+        /// <seealso cref="StartAsync"/>
+        /// <seealso cref="StopAsync"/>
+        public bool IsRunning { get; private set; }
+
         /// <summary>
         ///   Cancellation tokens for the listeners.
         /// </summary>
@@ -322,7 +329,8 @@ public Task StartAsync()
                 log.Warn("Peer key is missing, using unencrypted connections.");
             }
 
-            log.Debug("Starting");
+            IsRunning = true;
+            log.Debug("Started");
 
             return Task.CompletedTask;
         }
@@ -330,7 +338,8 @@ public Task StartAsync()
         /// <inheritdoc />
         public async Task StopAsync()
         {
-            log.Debug($"Stoping {LocalPeer}");
+            IsRunning = false;
+            log.Debug($"Stopping {LocalPeer}");
 
             // Stop the listeners.
             while (listeners.Count > 0)
@@ -346,7 +355,7 @@ public async Task StopAsync()
             BlackList = new BlackList<MultiAddress>();
             WhiteList = new WhiteList<MultiAddress>();
 
-            log.Debug($"Stoped {LocalPeer}");
+            log.Debug($"Stopped {LocalPeer}");
         }
 
 
diff --git a/test/SwarmTest.cs b/test/SwarmTest.cs
index 7dc43fb..13f88cd 100644
--- a/test/SwarmTest.cs
+++ b/test/SwarmTest.cs
@@ -791,6 +791,18 @@ public async Task PeerDiscovered()
             Assert.AreEqual(3, peerCount);
         }
 
+        [TestMethod]
+        public async Task IsRunning()
+        {
+            var swarm = new Swarm { LocalPeer = self };
+            Assert.IsFalse(swarm.IsRunning);
+
+            await swarm.StartAsync();
+            Assert.IsTrue(swarm.IsRunning);
+
+            await swarm.StopAsync();
+            Assert.IsFalse(swarm.IsRunning);
+        }
         [TestMethod]
         public async Task Connect_PrivateNetwork()
         {