diff --git a/src/routes/Discover/Discover.js b/src/routes/Discover/Discover.js
index 58fcf48af..7782770b0 100644
--- a/src/routes/Discover/Discover.js
+++ b/src/routes/Discover/Discover.js
@@ -189,11 +189,8 @@ const Discover = ({ urlParams, queryParams }) => {
                     null
             }
             {
-                addonModalOpen ?
-                    <AddonDetailsModal
-                        transportUrl={discover.catalog_resource.request.base}
-                        onCloseRequest={closeAddonModal}
-                    />
+                addonModalOpen && discover.catalog_resource !== null ?
+                    <AddonDetailsModal transportUrl={discover.catalog_resource.request.base} onCloseRequest={closeAddonModal} />
                     :
                     null
             }