diff --git a/landingPages/landing-utils/availableOn.component.ts b/landingPages/landing-utils/availableOn.component.ts
index f2c606c0..b3b6aaa3 100644
--- a/landingPages/landing-utils/availableOn.component.ts
+++ b/landingPages/landing-utils/availableOn.component.ts
@@ -36,7 +36,8 @@ import {properties} from "../../../../environments/environment";
           </div>
           <div *ngIf="available.collectedName">
             <span>Provider: </span>
-            <a *ngIf="available.collectedId" [routerLink]="dataProviderUrl" [queryParams]="{datasourceId: available.collectedId}">
+            <a *ngIf="available.collectedId" [routerLink]="dataProviderUrl"
+               [queryParams]="{datasourceId: available.collectedId}">
               {{available.collectedName}}
             </a>
           </div>
@@ -103,10 +104,8 @@ export class AvailableOnComponent {
   }
   
   public removeUnknown(value: string): string {
-    if(properties.environment === 'production') {
-      if (value.toLowerCase() === 'unknown') {
-        return null;
-      }
+    if (value.toLowerCase() === 'unknown') {
+      return null;
     }
     return value;
   }
diff --git a/notifications/notify-form/notify-form.component.ts b/notifications/notify-form/notify-form.component.ts
index adc34695..612f9cd4 100644
--- a/notifications/notify-form/notify-form.component.ts
+++ b/notifications/notify-form/notify-form.component.ts
@@ -99,7 +99,7 @@ export class NotifyFormComponent implements OnInit, OnDestroy {
   reset(message: string = null) {
     if (!this.availableGroups) {
       this.form = this.fb.group({
-        notify: this.fb.control(properties.environment === 'development'),
+        notify: this.fb.control(properties.environment !== 'production'),
         message: this.fb.control(message)
       });
       this.subscriptions.push(this.form.get('notify').valueChanges.subscribe(value => {