diff --git a/sharedComponents/navigationBar.component.html b/sharedComponents/navigationBar.component.html
index a322d538..67686a6b 100644
--- a/sharedComponents/navigationBar.component.html
+++ b/sharedComponents/navigationBar.component.html
@@ -1,9 +1,10 @@
 <div *ngIf="showMenu">
   <div *ngIf="properties.environment =='beta' || properties.environment =='development'"
        class="uk-visible@m" >
-    <img class="large-beta-indication"
+    <a [routerLink]="logoRoute" [href]="logoUrl"><img class="large-beta-indication"
          [src]="'assets/common-assets/'+(properties.environment =='beta'?'beta_flag.svg':'prototype_flag.svg')"
          alt="BETA">
+    </a>
   </div>
 <div class="tm-header-mobile uk-hidden@m">
    <nav class="uk-navbar-container uk-navbar" uk-navbar="">
diff --git a/sharedComponents/navigationBar.component.ts b/sharedComponents/navigationBar.component.ts
index 275e201d..6d7dbd7f 100644
--- a/sharedComponents/navigationBar.component.ts
+++ b/sharedComponents/navigationBar.component.ts
@@ -29,6 +29,11 @@ export class NavigationBarComponent {
   @Input() searchPlaceHolder: string = "Search for research results";
   keyword: string = "";
 
+  logosrc: string = "";
+  logoUrl:string;
+  logoRoute:string;
+  logoName:string;
+
 
   public isAuthorized: boolean = false;
   sub: any;
@@ -73,6 +78,20 @@ export class NavigationBarComponent {
           this.handleError("Error getting community information (e.g. pages,entities) for community with id: " + this.communityId, error);
         });
     }
+    if(!this.community){
+      this.logosrc = this.logoPath + "logo-large-"+this.portal+".png";
+      this.logoRoute = "/";
+      this.logoName = "OpenAIRE";
+
+    }else if( this.community){
+      this.logosrc = this.community.logoUrl;
+      if(this.homeurl){
+        this.logoRoute = "/";
+      }else{
+        this.logoUrl = 'https://'+(this.properties.environment =='beta'?'beta.':'')+this.community.id+'.openaire.eu';
+      }
+      this.logoName = this.community.name;
+    }
 
   }