diff --git a/src/auracaster_webui/app.py b/src/auracaster_webui/app.py
index 9b4eb4d..bc9e219 100644
--- a/src/auracaster_webui/app.py
+++ b/src/auracaster_webui/app.py
@@ -12,7 +12,7 @@ from multilang_translator.translator_client.translator_client import (
     get_groups, get_available_languages, get_group_state,
     start_announcement, update_group, get_available_endpoints
 )
-from multilang_translator.translator_api.translator_models import Endpoint, EndpointGroup, AnnouncementStates
+from multilang_translator.translator_models.translator_models import Endpoint, EndpointGroup, AnnouncementStates
 
 # Initialize session state for configuration
 if "endpoint_groups" not in st.session_state:
@@ -200,6 +200,9 @@ with st.container():
                     # Store the start time in session state
                     st.session_state.announcement_start_time = time.time()
                     
+                    # Update session state with the current message
+                    st.session_state.announcement_text = message
+                    
                     start_announcement(message, selected_group_id)
                     
                     # Set flag to show success message
@@ -209,8 +212,6 @@ with st.container():
                     st.session_state.announcement_id += 1
                     st.session_state.status_container_key = st.session_state.announcement_id
                     
-                    # Clear the announcement text after successful submission
-                    st.session_state.announcement_text = ""
                 except requests.exceptions.RequestException as e:
                     st.error(f"Failed to start announcement: {str(e)}")