diff --git a/src/Cody.UI/Controls/Options/GeneralOptionsControl.xaml b/src/Cody.UI/Controls/Options/GeneralOptionsControl.xaml
index 0f540316..d383d98e 100644
--- a/src/Cody.UI/Controls/Options/GeneralOptionsControl.xaml
+++ b/src/Cody.UI/Controls/Options/GeneralOptionsControl.xaml
@@ -24,22 +24,6 @@
                     <ColumnDefinition Width="Auto" />
                 </Grid.ColumnDefinitions>
 
-                <!--Sourcegraph URL-->
-                <Label
-                    Grid.Row="0"
-                    Grid.Column="0"
-                    Content="Sourcegraph URL"
-                />
-
-                <TextBox
-                    Name="SourcegraphUrlTextBox"
-                    Grid.Row="0"
-                    Grid.Column="1"
-                    Width="400"
-                    Height="20"
-                    Text="{Binding SourcegraphUrl, Mode=TwoWay}"
-                    ToolTip="Enter the URL of the Sourcegraph instance. For example, https://sourcegraph.example.com"
-                />
 
                 <!--Custom Cody Configuration-->
                 <StackPanel
@@ -90,7 +74,7 @@
 
 
 
-                
+
             </Grid>
         </GroupBox>
     </Grid>
diff --git a/src/Cody.UI/Controls/Options/GeneralOptionsControl.xaml.cs b/src/Cody.UI/Controls/Options/GeneralOptionsControl.xaml.cs
index 92da2d2d..0c79d529 100644
--- a/src/Cody.UI/Controls/Options/GeneralOptionsControl.xaml.cs
+++ b/src/Cody.UI/Controls/Options/GeneralOptionsControl.xaml.cs
@@ -16,7 +16,6 @@ public void ForceBindingsUpdate()
         {
             // TextBox binding doesn't work when Visual Studio closes Options window
             // This is a workaround to get bindings updated. The second solution is to use NotifyPropertyChange for every TextBox in the Xaml, but current solution is a little more "clean" - everything is clearly visible in a one place.
-            SourcegraphUrlTextBox.GetBindingExpression(TextBox.TextProperty)?.UpdateSource();
             CustomConfigurationTextBox.GetBindingExpression(TextBox.TextProperty)?.UpdateSource();
         }
     }
diff --git a/src/Cody.UI/ViewModels/GeneralOptionsViewModel.cs b/src/Cody.UI/ViewModels/GeneralOptionsViewModel.cs
index 57921291..31d03d33 100644
--- a/src/Cody.UI/ViewModels/GeneralOptionsViewModel.cs
+++ b/src/Cody.UI/ViewModels/GeneralOptionsViewModel.cs
@@ -52,19 +52,6 @@ public string CustomConfiguration
             }
         }
 
-        private string _sourcegraphUrl;
-        public string SourcegraphUrl
-        {
-            get => _sourcegraphUrl;
-            set
-            {
-                if (SetProperty(ref _sourcegraphUrl, value))
-                {
-                    _logger.Debug($"Sourcegraph Url set:{SourcegraphUrl}");
-                }
-            }
-        }
-
         private bool _acceptNonTrustedCert;
         public bool AcceptNonTrustedCert
         {
diff --git a/src/Cody.VisualStudio/Options/GeneralOptionsPage.cs b/src/Cody.VisualStudio/Options/GeneralOptionsPage.cs
index e3a7e29e..75a4fec3 100644
--- a/src/Cody.VisualStudio/Options/GeneralOptionsPage.cs
+++ b/src/Cody.VisualStudio/Options/GeneralOptionsPage.cs
@@ -58,10 +58,8 @@ protected override void OnActivate(CancelEventArgs e)
             _logger.Debug($"Settings page activated.");
 
             var customConfiguration = _settingsService.CustomConfiguration;
-            var sourcegraphUrl = _settingsService.ServerEndpoint;
             var acceptNonTrustedCert = _settingsService.AcceptNonTrustedCert;
 
-            _generalOptionsViewModel.SourcegraphUrl = sourcegraphUrl;
             _generalOptionsViewModel.AcceptNonTrustedCert = acceptNonTrustedCert;
             _generalOptionsViewModel.CustomConfiguration = customConfiguration;
 
@@ -74,11 +72,9 @@ protected override void OnApply(PageApplyEventArgs args)
             _logger.Debug($"{args.ApplyBehavior}");
 
             var customConfiguration = _generalOptionsViewModel.CustomConfiguration;
-            var sourcegraphUrl = _generalOptionsViewModel.SourcegraphUrl;
             var acceptNonTrustedCert = _generalOptionsViewModel.AcceptNonTrustedCert;
 
             _settingsService.CustomConfiguration = customConfiguration;
-            _settingsService.ServerEndpoint = sourcegraphUrl;
             _settingsService.AcceptNonTrustedCert = acceptNonTrustedCert;
         }
 
@@ -99,7 +95,6 @@ protected override void OnClosed(EventArgs e)
         public override void ResetSettings()
         {
             _settingsService.CustomConfiguration = string.Empty;
-            _settingsService.ServerEndpoint = string.Empty;
             _settingsService.AcceptNonTrustedCert = false;
 
             base.ResetSettings();