diff --git a/packages/ngx-forms/src/lib/datepicker/components/datepicker/datepicker.component.html b/packages/ngx-forms/src/lib/datepicker/components/datepicker/datepicker.component.html
index b348c682..d48f9f78 100644
--- a/packages/ngx-forms/src/lib/datepicker/components/datepicker/datepicker.component.html
+++ b/packages/ngx-forms/src/lib/datepicker/components/datepicker/datepicker.component.html
@@ -1,6 +1,6 @@
 <div aria-haspopup="grid" auiFlyout class="aui-datepicker a-input has-icon-right">
-  <label class="a-input__label" for="id">{{ label }}</label>
-  <small class="a-input__description" id="id"> {{ description }}</small>
+  <label class="a-input__label" for="id" *ngIf="label">{{ label }}</label>
+  <small class="a-input__description" id="id" *ngIf="description"> {{ description }}</small>
   <div class="a-input__wrapper">
     <input
       (blur)="handleBlur($event)"
@@ -15,11 +15,7 @@
       type="text"
     />
     <ng-container *ngIf="isDisabled">
-      <aui-icon
-        name="ai-calendar"
-        role="button"
-        tabindex="0"
-      />
+      <aui-icon name="ai-calendar" role="button" tabindex="0" />
     </ng-container>
     <ng-container *ngIf="!isDisabled">
       <aui-icon
diff --git a/packages/ngx-forms/src/lib/timepicker/components/timepicker/timepicker.component.html b/packages/ngx-forms/src/lib/timepicker/components/timepicker/timepicker.component.html
index 382e8c78..78fca9c8 100644
--- a/packages/ngx-forms/src/lib/timepicker/components/timepicker/timepicker.component.html
+++ b/packages/ngx-forms/src/lib/timepicker/components/timepicker/timepicker.component.html
@@ -1,7 +1,7 @@
 <div class="m-timepicker">
   <div *ngIf="!shouldUseFallback" [class]="'a-input--' + size" [ngClass]="{ 'has-error': hasError }" class="a-input">
-    <label class="a-input__label" for="id">{{ label }}</label>
-    <small class="a-input__description" id="id" [ngClass]="{ 'is-error': hasError }">
+    <label class="a-input__label" for="id" *ngIf="label">{{ label }}</label>
+    <small class="a-input__description" id="id" [ngClass]="{ 'is-error': hasError }" *ngIf="description">
       <aui-icon *ngIf="hasError" name="ai-alert-triangle"></aui-icon>
       {{ description }}</small
     >