diff --git a/jslib b/jslib
index a26527b500c..370952971ae 160000
--- a/jslib
+++ b/jslib
@@ -1 +1 @@
-Subproject commit a26527b500c01fa11931f68d76dfbcf32c442d4e
+Subproject commit 370952971ae5421802be97aa466492217620841d
diff --git a/src/app/layouts/organization-layout.component.html b/src/app/layouts/organization-layout.component.html
index c462f219887..7e4c35ce170 100644
--- a/src/app/layouts/organization-layout.component.html
+++ b/src/app/layouts/organization-layout.component.html
@@ -7,6 +7,12 @@
                 <span>{{organization.name}}</span>
                 <small class="text-muted">{{'organization' | i18n}}</small>
             </div>
+            <div class="ml-auto card border-danger text-danger bg-transparent" *ngIf="!organization.enabled">
+                <div class="card-body py-2">
+                    <i class="fa fa-exclamation-triangle"></i>
+                    {{'organizationIsDisabled' | i18n}}
+                </div>
+            </div>
         </div>
         <ul class="nav nav-tabs" *ngIf="organization.isAdmin">
             <li class="nav-item">
diff --git a/src/app/organizations/settings/organization-billing.component.html b/src/app/organizations/settings/organization-billing.component.html
index 7e20f3be2d7..0b117f8afd3 100644
--- a/src/app/organizations/settings/organization-billing.component.html
+++ b/src/app/organizations/settings/organization-billing.component.html
@@ -21,7 +21,13 @@
         <dt>{{'billingPlan' | i18n}}</dt>
         <dd>{{billing.plan}}</dd>
         <dt>{{'expiration' | i18n}}</dt>
-        <dd *ngIf="billing.expiration">{{billing.expiration | date:'mediumDate'}}</dd>
+        <dd *ngIf="billing.expiration">
+            {{billing.expiration | date:'mediumDate'}}
+            <span *ngIf="isExpired" class="text-danger ml-2">
+                <i class="fa fa-exclamation-triangle"></i>
+                {{'licenseIsExpired' | i18n}}
+            </span>
+        </dd>
         <dd *ngIf="!billing.expiration">{{'neverExpires' | i18n}}</dd>
     </dl>
     <div class="row" *ngIf="!selfHosted">
diff --git a/src/app/organizations/settings/organization-billing.component.ts b/src/app/organizations/settings/organization-billing.component.ts
index 222b1dc37b7..6769f663954 100644
--- a/src/app/organizations/settings/organization-billing.component.ts
+++ b/src/app/organizations/settings/organization-billing.component.ts
@@ -208,6 +208,10 @@ export class OrganizationBillingComponent implements OnInit {
         this.platformUtilsService.launchUri(url);
     }
 
+    get isExpired() {
+        return this.billing != null && this.billing.expiration != null && this.billing.expiration < new Date();
+    }
+
     get subscriptionMarkedForCancel() {
         return this.subscription != null && !this.subscription.cancelled && this.subscription.cancelAtEndDate;
     }
diff --git a/src/app/services/organization-guard.service.ts b/src/app/services/organization-guard.service.ts
index 4ee4b947561..89b9d2a53a2 100644
--- a/src/app/services/organization-guard.service.ts
+++ b/src/app/services/organization-guard.service.ts
@@ -5,11 +5,15 @@ import {
     Router,
 } from '@angular/router';
 
+import { ToasterService } from 'angular2-toaster';
+
+import { I18nService } from 'jslib/abstractions/i18n.service';
 import { UserService } from 'jslib/abstractions/user.service';
 
 @Injectable()
 export class OrganizationGuardService implements CanActivate {
-    constructor(private userService: UserService, private router: Router) { }
+    constructor(private userService: UserService, private router: Router,
+        private toasterService: ToasterService, private i18nService: I18nService) { }
 
     async canActivate(route: ActivatedRouteSnapshot) {
         const org = await this.userService.getOrganization(route.params.organizationId);
@@ -17,6 +21,11 @@ export class OrganizationGuardService implements CanActivate {
             this.router.navigate(['/']);
             return false;
         }
+        if (!org.isOwner && !org.enabled) {
+            this.toasterService.popAsync('error', null, this.i18nService.t('organizationIsDisabled'));
+            this.router.navigate(['/']);
+            return false;
+        }
 
         return true;
     }
diff --git a/src/app/settings/organizations.component.html b/src/app/settings/organizations.component.html
index 53918cb3dd6..861fd4d6a85 100644
--- a/src/app/settings/organizations.component.html
+++ b/src/app/settings/organizations.component.html
@@ -7,6 +7,7 @@
             <li *ngFor="let o of organizations">
                 <a [routerLink]="['/organizations', o.id]" class="text-body">
                     <i class="fa-li fa fa-caret-right"></i> {{o.name}}
+                    <i *ngIf="!o.enabled" class="fa fa-exclamation-triangle text-danger" title="{{'organizationIsDisabled' | i18n}}"></i>
                 </a>
             </li>
         </ul>
@@ -47,6 +48,7 @@
                     </td>
                     <td>
                         <a href="#" [routerLink]="['/organizations', o.id]">{{o.name}}</a>
+                        <i *ngIf="!o.enabled" class="fa fa-exclamation-triangle text-danger" title="{{'organizationIsDisabled' | i18n}}"></i>
                     </td>
                     <td class="table-list-options">
                         <div class="dropdown" appListDropdown>
diff --git a/src/locales/en/messages.json b/src/locales/en/messages.json
index c019cee14b1..be57b3a2f26 100644
--- a/src/locales/en/messages.json
+++ b/src/locales/en/messages.json
@@ -2393,5 +2393,11 @@
   "datePasswordUpdated": {
     "message": "Password Updated",
     "description": "ex. Date this password was updated"
+  },
+  "organizationIsDisabled": {
+    "message": "Organization is disabled."
+  },
+  "licenseIsExpired": {
+    "message": "License is expired."
   }
 }