diff --git a/src/components/EditListingDescriptionPanel/EditListingDescriptionPanel.js b/src/components/EditListingDescriptionPanel/EditListingDescriptionPanel.js
index 4dd34538..e0ec0a33 100644
--- a/src/components/EditListingDescriptionPanel/EditListingDescriptionPanel.js
+++ b/src/components/EditListingDescriptionPanel/EditListingDescriptionPanel.js
@@ -25,12 +25,14 @@ const EditListingDescriptionPanel = props => {
   const currentListing = ensureListing(listing);
   const { description, title } = currentListing.attributes;
   const listingTitle = title || '';
-  const params = { id: currentListing.id.uuid, slug: createSlug(title) };
-  const listingLink = (
-    <NamedLink name="ListingPage" params={params}>
-      {listingTitle}
-    </NamedLink>
-  );
+  const listingLink = currentListing.id
+    ? <NamedLink
+        name="ListingPage"
+        params={{ id: currentListing.id.uuid, slug: createSlug(title) }}
+      >
+        {listingTitle}
+      </NamedLink>
+    : '';
 
   const panelTitle = currentListing.id
     ? <FormattedMessage
diff --git a/src/components/EditListingLocationPanel/EditListingLocationPanel.js b/src/components/EditListingLocationPanel/EditListingLocationPanel.js
index bf93a4c5..9e29cc0d 100644
--- a/src/components/EditListingLocationPanel/EditListingLocationPanel.js
+++ b/src/components/EditListingLocationPanel/EditListingLocationPanel.js
@@ -25,12 +25,14 @@ const EditListingLocationPanel = props => {
   const currentListing = ensureListing(listing);
   const { address, geolocation, title } = currentListing.attributes;
   const listingTitle = title || '';
-  const params = { id: currentListing.id.uuid, slug: createSlug(title) };
-  const listingLink = (
-    <NamedLink name="ListingPage" params={params}>
-      {listingTitle}
-    </NamedLink>
-  );
+  const listingLink = currentListing.id
+    ? <NamedLink
+        name="ListingPage"
+        params={{ id: currentListing.id.uuid, slug: createSlug(title) }}
+      >
+        {listingTitle}
+      </NamedLink>
+    : '';
 
   const panelTitle = currentListing.id
     ? <FormattedMessage
diff --git a/src/components/EditListingPhotosPanel/EditListingPhotosPanel.js b/src/components/EditListingPhotosPanel/EditListingPhotosPanel.js
index cc5ddb58..fd336f40 100644
--- a/src/components/EditListingPhotosPanel/EditListingPhotosPanel.js
+++ b/src/components/EditListingPhotosPanel/EditListingPhotosPanel.js
@@ -100,12 +100,15 @@ class EditListingPhotosPanel extends Component {
     const { title } = currentListing.attributes;
     const listingTitle = title || '';
 
-    const params = { id: currentListing.id.uuid, slug: createSlug(title) };
-    const listingLink = (
-      <NamedLink name="ListingPage" params={params}>
-        {listingTitle}
-      </NamedLink>
-    );
+    const listingLink = currentListing.id
+      ? <NamedLink
+          name="ListingPage"
+          params={{ id: currentListing.id.uuid, slug: createSlug(title) }}
+        >
+          {listingTitle}
+        </NamedLink>
+      : '';
+
     const panelTitle = currentListing.id
       ? <FormattedMessage
           id="EditListingPhotosPanel.title"
diff --git a/src/components/EditListingPricingPanel/EditListingPricingPanel.js b/src/components/EditListingPricingPanel/EditListingPricingPanel.js
index 9452c096..6a1c0fbd 100644
--- a/src/components/EditListingPricingPanel/EditListingPricingPanel.js
+++ b/src/components/EditListingPricingPanel/EditListingPricingPanel.js
@@ -25,13 +25,14 @@ const EditListingPricingPanel = props => {
   const currentListing = ensureListing(listing);
   const { price, title } = currentListing.attributes;
   const listingTitle = title || '';
-
-  const params = { id: currentListing.id.uuid, slug: createSlug(title) };
-  const listingLink = (
-    <NamedLink name="ListingPage" params={params}>
-      {listingTitle}
-    </NamedLink>
-  );
+  const listingLink = currentListing.id
+    ? <NamedLink
+        name="ListingPage"
+        params={{ id: currentListing.id.uuid, slug: createSlug(title) }}
+      >
+        {listingTitle}
+      </NamedLink>
+    : '';
 
   const panelTitle = currentListing.id
     ? <FormattedMessage id="EditListingPricingPanel.title" values={{ listingTitle: listingLink }} />