diff --git a/src/Microsoft.SqlTools.ServiceLayer/DisasterRecovery/RestoreOperation/RestoreOptionFactory.cs b/src/Microsoft.SqlTools.ServiceLayer/DisasterRecovery/RestoreOperation/RestoreOptionFactory.cs
index 54951cac..b979e772 100644
--- a/src/Microsoft.SqlTools.ServiceLayer/DisasterRecovery/RestoreOperation/RestoreOptionFactory.cs
+++ b/src/Microsoft.SqlTools.ServiceLayer/DisasterRecovery/RestoreOperation/RestoreOptionFactory.cs
@@ -537,15 +537,9 @@ namespace Microsoft.SqlTools.ServiceLayer.DisasterRecovery.RestoreOperation
                    },
                    ValidateFunction = (IRestoreDatabaseTaskDataObject restoreDataObject, object currentValue, object defaultValue) =>
                    {
-                       string errorMessage = string.Empty;
-                       if (currentValue!= null && DatabaseUtils.IsSystemDatabaseConnection(currentValue.ToString()))
-                       {
-                           errorMessage = "Cannot restore to system database";
-                       }
                        return new OptionValidationResult()
                        {
-                           IsReadOnly = !restoreDataObject.CanChangeTargetDatabase,
-                           ErrorMessage = errorMessage
+                           IsReadOnly = false
                        };
                    },
                    SetValueFunction = (IRestoreDatabaseTaskDataObject restoreDataObject, object value) =>
diff --git a/test/Microsoft.SqlTools.ServiceLayer.UnitTests/DisasterRecovery/RestoreOptionsHelperTests.cs b/test/Microsoft.SqlTools.ServiceLayer.UnitTests/DisasterRecovery/RestoreOptionsHelperTests.cs
index d035285c..0cb3817a 100644
--- a/test/Microsoft.SqlTools.ServiceLayer.UnitTests/DisasterRecovery/RestoreOptionsHelperTests.cs
+++ b/test/Microsoft.SqlTools.ServiceLayer.UnitTests/DisasterRecovery/RestoreOptionsHelperTests.cs
@@ -246,7 +246,7 @@ namespace Microsoft.SqlTools.ServiceLayer.UnitTests.DisasterRecovery
         }
 
         [Fact]
-        public void TargetDatabaseNameShouldSetToDefaultIfNotValid()
+        public void TargetDatabaseNameShouldBeWhatIsRequested()
         {
             RestoreParams restoreParams = CreateOptionsTestData();
             string defaultDbName = "default";
@@ -260,12 +260,12 @@ namespace Microsoft.SqlTools.ServiceLayer.UnitTests.DisasterRecovery
             RestoreOptionFactory.Instance.SetAndValidate(RestoreOptionsHelper.TargetDatabaseName, restoreDatabaseTaskDataObject);
 
             string actual = restoreDatabaseTaskDataObject.TargetDatabaseName;
-            string expected = defaultDbName;
+            string expected = currentDbName;
             Assert.Equal(actual, expected);
         }
 
         [Fact]
-        public void TargetDatabaseNameShouldStayTheSameIfValid()
+        public void TargetDatabaseNameShouldBeWhatIsRequested2()
         {
             RestoreParams restoreParams = CreateOptionsTestData();
             string defaultDbName = "default";