diff --git a/plugins/org.jkiss.dbeaver.ext.mssql.ui/src/org/jkiss/dbeaver/ext/mssql/ui/SQLServerConnectionPage.java b/plugins/org.jkiss.dbeaver.ext.mssql.ui/src/org/jkiss/dbeaver/ext/mssql/ui/SQLServerConnectionPage.java
index 7e6a20e019df44e498c47db4b0ab464213a26cda..e51999ff258fb1a77c2506df4f0e915c1988e506 100644
--- a/plugins/org.jkiss.dbeaver.ext.mssql.ui/src/org/jkiss/dbeaver/ext/mssql/ui/SQLServerConnectionPage.java
+++ b/plugins/org.jkiss.dbeaver.ext.mssql.ui/src/org/jkiss/dbeaver/ext/mssql/ui/SQLServerConnectionPage.java
@@ -247,7 +247,7 @@ public class SQLServerConnectionPage extends ConnectionPageAbstract implements I
             if (getSite().isNew() && CommonUtils.isEmpty(databaseName)) {
                 databaseName = CommonUtils.notEmpty(site.getDriver().getDefaultDatabase());
             }
-            dbText.setText(databaseName);
+            dbText.setText(CommonUtils.notEmpty(databaseName));
         }
         if (userNameText != null) {
             if (site.isNew() && CommonUtils.isEmpty(connectionInfo.getUserName())) {