diff --git a/MVMCoreUI/Atomic/Atoms/Views/TileContainer.swift b/MVMCoreUI/Atomic/Atoms/Views/TileContainer.swift
index d93c8799..7c2c13ac 100644
--- a/MVMCoreUI/Atomic/Atoms/Views/TileContainer.swift
+++ b/MVMCoreUI/Atomic/Atoms/Views/TileContainer.swift
@@ -21,7 +21,13 @@ open class TileContainer: VDS.TileContainer, VDSMoleculeViewProtocol{
     public var delegateObject: MVMCoreUIDelegateObject?
     public var additionalData: [AnyHashable: Any]?
         
-    public var molecule: MoleculeViewProtocol?
+    public var molecule: MoleculeViewProtocol? {
+        willSet {
+            if newValue == nil {
+                molecule?.removeFromSuperview()
+            }
+        }
+    }
     
     //--------------------------------------------------
     // MARK: - Initializers