diff --git a/app/DD_Clipboard_Searcher/frmMain.vb b/app/DD_Clipboard_Searcher/frmMain.vb
index 6e0342e..6a05334 100644
--- a/app/DD_Clipboard_Searcher/frmMain.vb
+++ b/app/DD_Clipboard_Searcher/frmMain.vb
@@ -365,7 +365,8 @@ Public Class frmMain
         Dim oService As New State.ServiceState() With {
             .Address = ConfigManager.Config.AppServerConfig,
             .IsActive = ConfigManager.Config.IsIDB,
-            .IsOnline = False
+            .IsOnline = False,
+            .Client = _Client
         }
 
         Dim oSettings As New State.SettingsState() With {
diff --git a/app/DD_Clipboard_Searcher/modCurrent.vb b/app/DD_Clipboard_Searcher/modCurrent.vb
index 8e07c83..853495d 100644
--- a/app/DD_Clipboard_Searcher/modCurrent.vb
+++ b/app/DD_Clipboard_Searcher/modCurrent.vb
@@ -82,7 +82,7 @@ Module modCurrent
     Public CurrSearchOpen As Boolean = False
 
     Public CurrMatchTreeView As New TreeView
-    Public _Client As Client
+    Public Property _Client As Client
     Public Property DatabaseFallback As DatabaseWithFallback
     Public APPSERVER_ACTIVE As Boolean = False
     Public WORKING_MODE As String = ""