diff --git a/lib/content-services/src/lib/content-node-share/content-node-share.dialog.ts b/lib/content-services/src/lib/content-node-share/content-node-share.dialog.ts
index e2dea00116..ad085d04ab 100644
--- a/lib/content-services/src/lib/content-node-share/content-node-share.dialog.ts
+++ b/lib/content-services/src/lib/content-node-share/content-node-share.dialog.ts
@@ -281,10 +281,16 @@ export class ShareDialogComponent implements OnInit, OnDestroy {
 
     private updateNode(date: moment.Moment) {
 
-        const expiryDate = date
-            ? (this.type === 'date' ? date.endOf('day').utc().format('YYYY-MM-DDTHH:mm:ss.SSSZ')
-            : date.utc().format('YYYY-MM-DDTHH:mm:ss.SSSZ'))
-            : null;
+        let expiryDate: Date | string;
+        if (date) {
+            if (this.type === 'date') {
+                expiryDate =  date.endOf('day').utc().format('YYYY-MM-DDTHH:mm:ss.SSSZ');
+            } else {
+                expiryDate = date.utc().format('YYYY-MM-DDTHH:mm:ss.SSSZ');
+            }
+        } else {
+            expiryDate = null;
+        }
 
         if (this.sharedId && expiryDate) {
                 this.isDisabled = true;