diff --git a/extensions/cms/src/cmsResource/cmsResourceCommands.ts b/extensions/cms/src/cmsResource/cmsResourceCommands.ts
index 1ab061ecd4..cebaf627b3 100644
--- a/extensions/cms/src/cmsResource/cmsResourceCommands.ts
+++ b/extensions/cms/src/cmsResource/cmsResourceCommands.ts
@@ -33,20 +33,27 @@ export function registerCmsServerCommand(appContext: AppContext, tree: CmsResour
 					return server.name === registeredCmsServerName;
 				});
 			}
-			if (!serverExists) {
-				// remove any group ID if user selects a connection from
-				// recent connection list
-				connection.options.groupId = null;
-				let registeredCmsServerDescription = connection.options.registeredServerDescription;
-				let ownerUri = await azdata.connection.getUriForConnection(connection.connectionId);
-				appContext.cmsUtils.cacheRegisteredCmsServer(registeredCmsServerName, registeredCmsServerDescription, ownerUri, connection);
-				tree.notifyNodeChanged(undefined);
-			} else {
-				// error out for same server name
+
+			// don't allow duplicate server entries
+			if (serverExists) {
 				let errorText = localize('cms.errors.sameCmsServerName', "Central Management Server Group already has a Registered Server with the name {0}", registeredCmsServerName);
-				appContext.apiWrapper.showErrorMessage(errorText);
 				throw new Error(errorText);
 			}
+
+			// don't allow azure servers
+			let isCloud: boolean = connection.options.isCloud;
+			if (isCloud) {
+				let errorText = localize('cms.errors.azureNotAllowed', "Azure SQL Servers cannot be used as Central Management Servers");
+				throw new Error(errorText);
+			}
+
+			// remove any group ID if user selects a connection from
+			// recent connection list
+			connection.options.groupId = null;
+			let registeredCmsServerDescription = connection.options.registeredServerDescription;
+			let ownerUri = await azdata.connection.getUriForConnection(connection.connectionId);
+			appContext.cmsUtils.cacheRegisteredCmsServer(registeredCmsServerName, registeredCmsServerDescription, ownerUri, connection);
+			tree.notifyNodeChanged(undefined);
 		}
 	});
 }
diff --git a/resources/xlf/en/cms.xlf b/resources/xlf/en/cms.xlf
index 85f4177a46..66ac3b5f19 100644
--- a/resources/xlf/en/cms.xlf
+++ b/resources/xlf/en/cms.xlf
@@ -336,6 +336,9 @@
     <trans-unit id="cms.errors.sameCmsServerName">
       <source xml:lang="en">Central Management Server Group already has a Registered Server with the name {0}</source>
     </trans-unit>
+    <trans-unit id="cms.errors.azureNotAllowed">
+      <source xml:lang="en">Azure SQL Database Servers cannot be used as Central Management Servers</source>
+    </trans-unit>
     <trans-unit id="cms.confirmDeleteServer">
       <source xml:lang="en">Are you sure you want to delete</source>
     </trans-unit>
@@ -372,4 +375,4 @@
       <source xml:lang="en">You cannot add a shared registered server with the same name as the Configuration Server</source>
     </trans-unit>
   </body></file>
-</xliff>
\ No newline at end of file
+</xliff>
diff --git a/src/sql/workbench/services/connection/browser/connectionManagementService.ts b/src/sql/workbench/services/connection/browser/connectionManagementService.ts
index 0e547c6577..e692575516 100644
--- a/src/sql/workbench/services/connection/browser/connectionManagementService.ts
+++ b/src/sql/workbench/services/connection/browser/connectionManagementService.ts
@@ -1040,6 +1040,9 @@ export class ConnectionManagementService extends Disposable implements IConnecti
 						this._connectionStatusManager.deleteConnection(uri);
 						resolve({ connected: connectResult, errorMessage: errorMessage, errorCode: errorCode, callStack: callStack, connectionProfile: connection });
 					} else {
+						if (connectionMngInfo.serverInfo) {
+							connection.options.isCloud = connectionMngInfo.serverInfo.isCloud;
+						}
 						resolve({ connected: connectResult, errorMessage: errorMessage, errorCode: errorCode, callStack: callStack, connectionProfile: connection });
 					}
 				}