diff --git a/src/app/components/shared/content-node-share/content-node-share.dialog.html b/src/app/components/shared/content-node-share/content-node-share.dialog.html
index ea2b2f556..5fc3903ec 100644
--- a/src/app/components/shared/content-node-share/content-node-share.dialog.html
+++ b/src/app/components/shared/content-node-share/content-node-share.dialog.html
@@ -56,7 +56,7 @@
                 </mat-datetimepicker-toggle>
                 <mat-datetimepicker #datetimePicker
                     (closed)="onDatetimepickerClosed()"
-                    type="datetime" openOnFocus="true"
+                    type="date"  openOnFocus="true"
                     timeInterval="1">
                 </mat-datetimepicker>
                 <input class="adf-share-link__input"
diff --git a/src/app/components/shared/content-node-share/content-node-share.dialog.ts b/src/app/components/shared/content-node-share/content-node-share.dialog.ts
index 3599fed68..5f69011ce 100644
--- a/src/app/components/shared/content-node-share/content-node-share.dialog.ts
+++ b/src/app/components/shared/content-node-share/content-node-share.dialog.ts
@@ -217,7 +217,12 @@ export class ShareDialogComponent implements OnInit, OnDestroy {
   private updateNode(date: moment.Moment): Observable<MinimalNodeEntryEntity> {
     return this.nodesApiService.updateNode(this.data.node.entry.id, {
       properties: {
-        'qshare:expiryDate': date ? date.utc().format() : null
+        'qshare:expiryDate': date
+          ? date
+              .utc()
+              .endOf('day')
+              .format()
+          : null
       }
     });
   }