diff --git a/src/Discord.Net.WebSocket/Entities/Interaction/Slash Commands/SocketAutocompleteInteractionData.cs b/src/Discord.Net.WebSocket/Entities/Interaction/Slash Commands/SocketAutocompleteInteractionData.cs
index 06e313b44..0da0332db 100644
--- a/src/Discord.Net.WebSocket/Entities/Interaction/Slash Commands/SocketAutocompleteInteractionData.cs	
+++ b/src/Discord.Net.WebSocket/Entities/Interaction/Slash Commands/SocketAutocompleteInteractionData.cs	
@@ -51,6 +51,9 @@ namespace Discord.WebSocket
             Current = options.FirstOrDefault(x => x.Focused);
             Options = options.ToImmutableArray();
 
+            if (Options?.Count == 1 && Current == null)
+                Current = Options.FirstOrDefault();
+
             CommandName = model.Name;
             CommandId = model.Id;
             Type = model.Type;