diff --git a/Assets/Scripts/Messaging/Typer/MessageManager.cs b/Assets/Scripts/Messaging/Typer/MessageManager.cs
index 4a10001..4b887bc 100644
--- a/Assets/Scripts/Messaging/Typer/MessageManager.cs
+++ b/Assets/Scripts/Messaging/Typer/MessageManager.cs
@@ -36,8 +36,9 @@ namespace Messaging {
 		}
 
 		private async void SendRandomJoke(float delay) {
-			_currentJoke = GetRandomJoke();
+			//TODO: Lock send button here
 			await Task.Delay((int)(delay * 1000));
+			_currentJoke = GetRandomJoke();
 			CreateMessage(_currentJoke.QuestionMessage.Key, false);
 		}