diff --git a/BeWo/Services/BeWoControlFactory.cs b/BeWo/Services/BeWoControlFactory.cs
index d09f56ba9..828f5c42c 100644
--- a/BeWo/Services/BeWoControlFactory.cs
+++ b/BeWo/Services/BeWoControlFactory.cs
@@ -13,11 +13,6 @@ namespace BeWo.Services
 	{
 		public Control GetAiConversationControl(UIContext uIContext, Dictionary<TableID, long[]> context)
 		{
-#if !DEBUG
-			BeWoApp.ShowInfoMessage("Diese Funktion befindet sich in der Testphase.");
-			return null;
-#endif
-
 			var control = new AiConversationChatView();
 
 			control.ViewModel.UIContext = (int)uIContext;
diff --git a/BeWo/Services/BeWoWindowFactory.cs b/BeWo/Services/BeWoWindowFactory.cs
index 2dfc079ce..2db9bcc72 100644
--- a/BeWo/Services/BeWoWindowFactory.cs
+++ b/BeWo/Services/BeWoWindowFactory.cs
@@ -23,11 +23,6 @@ namespace BeWo.Services
 
 		public AnimatedBeWoWindow GetAiConversationWindow(UIContext uIContext, Control control, double height = 600, double width = 1200)
 		{
-#if !DEBUG
-			BeWoApp.ShowInfoMessage("Diese Funktion befindet sich in der Testphase.");
-			return null;
-#endif
-
 			string title = null;
 
 			UIContext2Header.TryGetValue(uIContext, out title);
diff --git a/BeWo/Services/BeWoWindowService.cs b/BeWo/Services/BeWoWindowService.cs
index 66b18cfdf..7cbb8f80f 100644
--- a/BeWo/Services/BeWoWindowService.cs
+++ b/BeWo/Services/BeWoWindowService.cs
@@ -23,12 +23,23 @@ namespace BeWo.Services
 
 		public void ShowAiConversationWindow(UIContext uIContext, Dictionary<TableID, long[]> bewoObjects) 
 		{
+#if !DEBUG
+			BeWoApp.ShowInfoMessage("Diese Funktion befindet sich in der Testphase.");
+			return;
+#endif
+
 			ShowWindowDialog(
 				cf => cf.GetAiConversationControl(uIContext, bewoObjects),
 				(wf, ctrl) => wf.GetAiConversationWindow(uIContext, ctrl));
+
 		}
 		public void ShowAiConversationModalViewWindow(UIContext uIContext, Dictionary<TableID, long[]> bewoObjects)
 		{
+#if !DEBUG
+			BeWoApp.ShowInfoMessage("Diese Funktion befindet sich in der Testphase.");
+			return;
+#endif
+
 			ShowModalViewWindow(cf => cf.GetAiConversationControl(uIContext, bewoObjects));
 		}