diff --git a/Tikhole.Engine/Committer.cs b/Tikhole.Engine/Committer.cs
index 353f059..f83e92a 100644
--- a/Tikhole.Engine/Committer.cs
+++ b/Tikhole.Engine/Committer.cs
@@ -11,7 +11,7 @@ public class Committer
         public static uint Committed = 0;
         public static uint ComitterTimeoutMS = 1000;
         public static uint ComitterDelayMS = 100;
-        public static uint TotalInstances { get; private set; } = 0;
+        public static uint TotalInstances { get; set; } = 0;
         public static uint NeededInstances = 2;
         public static IPEndPoint RouterOSIPEndPoint = new(IPAddress.Parse("192.168.200.1"), 8728);
         public TcpClient TcpClient = new();
diff --git a/Tikhole.Engine/Listener.cs b/Tikhole.Engine/Listener.cs
index cbf7b53..d78ab05 100644
--- a/Tikhole.Engine/Listener.cs
+++ b/Tikhole.Engine/Listener.cs
@@ -18,7 +18,7 @@ public Listener()
                 Client.Client.Bind(IPEndPoint);
                 Task listener = new Task(() =>
                 {
-                    while (Client != null)
+                    while (Client.Client != null)
                     {
                         IPEndPoint? ipEndPoint = null;
                         try
@@ -32,6 +32,7 @@ public Listener()
                             Logger.Warning("Error receiving request.");
                         }
                     }
+                    Logger.Info("Listener stopped.");
                 }, TaskCreationOptions.LongRunning);
                 listener.Start();
                 Logger.Success("Listener started on " + IPEndPoint.ToString() + ".");
diff --git a/Tikhole.Engine/Tikhole.cs b/Tikhole.Engine/Tikhole.cs
index 185f44f..95b4ce7 100644
--- a/Tikhole.Engine/Tikhole.cs
+++ b/Tikhole.Engine/Tikhole.cs
@@ -24,6 +24,7 @@ public Tikhole()
             Forwarder = new Forwarder();
             Parser = new Parser();
             Matcher = new Matcher();
+            Committer.TotalInstances = 0;
             for (int i = 0; i < Committer.NeededInstances; i++) new Committer();
             new Responder();
         }
diff --git a/Tikhole.Website/Components/Pages/Settings.razor b/Tikhole.Website/Components/Pages/Settings.razor
index 3c603c6..986f9b8 100644
--- a/Tikhole.Website/Components/Pages/Settings.razor
+++ b/Tikhole.Website/Components/Pages/Settings.razor
@@ -8,7 +8,8 @@
     <small>A list of Tikhole settings. Changes made here are in real-time.</small>
 </p>
 <hr />
-<button @onclick="StopTikhole" class="btn d-block ms-auto btn-dark">🛑 Stop Tikhole</button>
+<button @onclick="RestartTikhole" class="btn btn-dark">🔃 Restart Tikhole</button>
+<button @onclick="StopTikhole" class="btn btn-dark">🛑 Stop Tikhole</button>
 <hr />
 @if (Error != "")
 {
@@ -21,6 +22,17 @@
         </div>
     </div>
 }
+@if (Info != "")
+{
+    <div class="toast show position-fixed bottom-0 end-0 m-3">
+        <div class="toast-header">
+            <strong class="me-auto">ℹ️ Info</strong>
+        </div>
+        <div class="toast-body">
+            @Info
+        </div>
+    </div>
+}
 <div style="max-width:500px;">
     <h5>🌎 RouterOS Settings</h5>
     <hr />
@@ -79,9 +91,22 @@
 
 @code {
     private string Error { get; set; } = "";
-    private void StopTikhole()
+    private string Info { get; set; } = "";
+    private async void RestartTikhole()
+    {
+        Tikhole.RestartTikhole();
+        Info = "Tikhole engine restarted.";
+        await Task.Delay(3000);
+        Info = "";
+        StateHasChanged();
+    }
+    private async void StopTikhole()
     {
-        if (Tikhole.WebApplication != null) Tikhole.WebApplication.StopAsync();
+        Tikhole.StopTikhole();
+        Info = "Tikhole engine stopped.";
+        await Task.Delay(3000);
+        Info = "";
+        StateHasChanged();
     }
     private string CommitterEndpoint
     {
diff --git a/Tikhole.Website/Tikhole.cs b/Tikhole.Website/Tikhole.cs
index 7e58ee3..ba2494b 100644
--- a/Tikhole.Website/Tikhole.cs
+++ b/Tikhole.Website/Tikhole.cs
@@ -17,5 +17,14 @@ public static void Main(string[] args)
             WebApplication.MapRazorComponents<App>().AddInteractiveServerRenderMode();
             WebApplication.Run();
         }
+        public static void StopTikhole()
+        {
+            Engine.Tikhole.Listener?.Client.Close();
+        }
+        public static void RestartTikhole()
+        {
+            Engine.Tikhole.Listener?.Client.Close();
+            _ = Task.Run(() => new Engine.Tikhole());
+        }
     }
 }
\ No newline at end of file