diff --git a/UI/WebServerResources/js/Scheduler/Component.service.js b/UI/WebServerResources/js/Scheduler/Component.service.js
index 8b19b56c8..26f1db8f4 100644
--- a/UI/WebServerResources/js/Scheduler/Component.service.js
+++ b/UI/WebServerResources/js/Scheduler/Component.service.js
@@ -833,7 +833,14 @@
   Component.prototype.deleteAttachUrl = function(index) {
 
     if (index > -1 && this.attachUrls.length > index) {
+      var currentUrl = this.attachUrls[index];
       this.attachUrls.splice(index, 1);
+      var jitsiBaseUrl = "https://meet.jit.si";
+      if(Component.$Preferences.defaults && Component.$Preferences.defaults.SOGoCalendarJitsiBaseUrl)
+        jitsiBaseUrl = Component.$Preferences.defaults.SOGoCalendarJitsiBaseUrl;
+      if (currentUrl.value.includes(jitsiBaseUrl)) {
+        this.location = "";
+      }
     }
   };
 
diff --git a/UI/WebServerResources/js/Scheduler/ComponentController.js b/UI/WebServerResources/js/Scheduler/ComponentController.js
index 6ec9f84b2..1dcddf91c 100644
--- a/UI/WebServerResources/js/Scheduler/ComponentController.js
+++ b/UI/WebServerResources/js/Scheduler/ComponentController.js
@@ -323,6 +323,7 @@
         jitsiRoomPrefix = this.preferences.defaults.SOGoCalendarJitsiRoomPrefix;
       var jitsiUrl = jitsiBaseUrl + "/" + jitsiRoomPrefix + crypto.randomUUID();
       var i = this.component.addAttachUrl(jitsiUrl);
+      this.component.location = jitsiUrl;
       focus('attachUrl_' + i);
     };