diff --git a/client/ui/qml/Pages2/PageShare.qml b/client/ui/qml/Pages2/PageShare.qml
index b0c11f79c..c17f7e26d 100644
--- a/client/ui/qml/Pages2/PageShare.qml
+++ b/client/ui/qml/Pages2/PageShare.qml
@@ -859,7 +859,11 @@ PageType {
                                         var noButtonFunction = function() {
                                         }
 
-                                        if (ConnectionController.isConnectionInProgress()) {
+                                        var isActiveConfigForCurrentClient = ServersModel.isDefaultServerCurrentlyProcessed()
+                                                && ServersModel.getDefaultServerData("defaultContainer") === ContainersModel.getProcessedContainerIndex()
+
+                                        if ((ConnectionController.isConnectionInProgress || ConnectionController.isConnected)
+                                                && isActiveConfigForCurrentClient) {
                                             PageController.showNotificationMessage("Disconnect from VPN to revoke this config")
                                         } else {
                                             showQuestionDrawer(headerText, descriptionText, yesButtonText, noButtonText, yesButtonFunction, noButtonFunction)