diff --git a/client/src/components/base/MapContainer.vue b/client/src/components/base/MapContainer.vue
index e888f503..923b85c2 100644
--- a/client/src/components/base/MapContainer.vue
+++ b/client/src/components/base/MapContainer.vue
@@ -48,17 +48,19 @@ export default {
       updateSource(geojson) {
       const view = this.olMap.getView()
       const source = this.vectorLayer.getSource()
-      const features = new GeoJSON({
+      const features = geojson ? new GeoJSON({
         featureProjection: 'EPSG:3857',
-      }).readFeatures(geojson)
+      }).readFeatures(geojson) : null
       source.clear();
-      source.addFeatures(features);
+      if(features){
+        source.addFeatures(features);
+        // this zooms the view on the created object
+        view.fit(source.getExtent(), {
+          size: this.olMap.getSize(),
+          maxZoom: 4
+        });
+      }
 
-      // this zooms the view on the created object
-      view.fit(source.getExtent(), {
-        size: this.olMap.getSize(),
-        maxZoom: 4
-      });
     },
     closePopup(){
       this.overlay.setPosition(undefined)
diff --git a/client/src/components/organism/OrganismsComponent.vue b/client/src/components/organism/OrganismsComponent.vue
index c2346651..6de8ce75 100644
--- a/client/src/components/organism/OrganismsComponent.vue
+++ b/client/src/components/organism/OrganismsComponent.vue
@@ -21,7 +21,7 @@
               <b-dropdown-item :disabled="selectedOrganisms.lenght === 0" @click="deleteOrganisms(selectedOrganisms)" variant="danger">Delete selected organisms</b-dropdown-item>
           </b-dropdown>         
         </template>
-        <template v-if="bioprojects.lenght" #cell(bioprojects)="data">
+        <template #cell(bioprojects)="data">
           <b-link target="_blank" v-for="bioproject in data.item.bioprojects" :key="bioproject" :href="'https://www.ebi.ac.uk/ena/browser/view/'+bioproject">
             {{bioproject}}
           </b-link>
diff --git a/client/src/views/MapPage.vue b/client/src/views/MapPage.vue
index ebe7d431..0e3ca839 100644
--- a/client/src/views/MapPage.vue
+++ b/client/src/views/MapPage.vue
@@ -52,6 +52,9 @@ export default {
                 if(resp && resp.data){
                     this.geoJson = resp.data         
                 }
+                else{
+                    this.geoJson = null
+                }
                 this.$store.dispatch('portal/hideLoading')
             })
             .catch(e=>{