diff --git a/src/Resources/public/js/c4g-popup-controller.js b/src/Resources/public/js/c4g-popup-controller.js
index 89530c53..de242908 100644
--- a/src/Resources/public/js/c4g-popup-controller.js
+++ b/src/Resources/public/js/c4g-popup-controller.js
@@ -41,7 +41,7 @@ export class C4gPopupController {
       this.mapData.map.removeOverlay(this.popups[0].popup);
     }
     else if (this.popups[0] && this.popups[0].popupComponent) {
-      this.popups[0].popupComponent.close();
+      this.popups[0].popupComponent.close(true);
     }
   }
 }
\ No newline at end of file
diff --git a/src/Resources/public/js/components/c4g-popup-container.jsx b/src/Resources/public/js/components/c4g-popup-container.jsx
index e81d7fa1..d4c90244 100644
--- a/src/Resources/public/js/components/c4g-popup-container.jsx
+++ b/src/Resources/public/js/components/c4g-popup-container.jsx
@@ -64,7 +64,7 @@ export class PopupContainer extends Component {
             <div className={"c4g-popup-wrapper"}>
               <Suspense fallback={<div>Loading...</div>}>
                 <Titlebar wrapperClass={headerClass} headerClass={"c4g-popup-header-headline"} header={this.props.mapData.popupHeadline || ""}
-                          closeBtnClass={"c4g-titlebar-close"} closeBtnCb={this.close} closeBtnTitle={this.language.CLOSE}
+                          closeBtnClass={"c4g-titlebar-close"} closeBtnCb={() => {this.close(true)}} closeBtnTitle={this.language.CLOSE}
                           detailBtnClass={""} detailBtnCb={""}>
                   {addButtons}
                 </Titlebar>
@@ -101,11 +101,11 @@ export class PopupContainer extends Component {
     });
   }
 
-  close() {
+  close(boolean = false) {
     if (this.props.mapData.caching) {
       utils.storeValue('popupInfos', "");
     }
-    if (this.state.activeComps) {
+    if (boolean && this.state.activeComps) {
       for (let i in this.state.activeComps) {
         if (this.state.activeComps.hasOwnProperty(i)) {
           let comp = this.state.activeComps[i];