diff --git a/demo-shell/src/app/components/files/files.component.html b/demo-shell/src/app/components/files/files.component.html
index 8aed52211c..3d0228cac3 100644
--- a/demo-shell/src/app/components/files/files.component.html
+++ b/demo-shell/src/app/components/files/files.component.html
@@ -119,7 +119,7 @@
                         </mat-icon>
                     </button>
                     <button mat-icon-button
-                            [disabled]="!shareRef.isFile"
+                            [disabled]="documentList.selection.length && !shareRef.isFile"
                             [baseShareUrl]="baseShareUrl"
                             #shareRef="adfShare"
                             [adf-share]="documentList.selection[0]"
diff --git a/lib/content-services/content-node-share/content-node-share.dialog.ts b/lib/content-services/content-node-share/content-node-share.dialog.ts
index 52dd441f53..d474e29dd9 100644
--- a/lib/content-services/content-node-share/content-node-share.dialog.ts
+++ b/lib/content-services/content-node-share/content-node-share.dialog.ts
@@ -47,7 +47,7 @@ import moment from 'moment-es6';
 export class ShareDialogComponent implements OnInit, OnDestroy {
     private subscriptions: Subscription[] = [];
 
-    minDate = moment().toDate();
+    minDate = moment().add(1, 'd');
     sharedId: string;
     fileName: string;
     baseShareUrl: string;
@@ -159,7 +159,6 @@ export class ShareDialogComponent implements OnInit, OnDestroy {
                     this.isFileShared = true;
 
                     this.updateForm();
-
                 }
             },
             () => {
@@ -188,7 +187,7 @@ export class ShareDialogComponent implements OnInit, OnDestroy {
 
         this.form.setValue({
             'sharedUrl': `${this.baseShareUrl}${this.sharedId}`,
-            'time': expiryDate ? moment(expiryDate) : null
+            'time': expiryDate ? expiryDate : null
         });
     }
 
@@ -197,7 +196,7 @@ export class ShareDialogComponent implements OnInit, OnDestroy {
             this.data.node.entry.id,
             {
                 properties: {
-                    'qshare:expiryDate': updates.time ? updates.time.format() : null
+                    'qshare:expiryDate': updates.time ? updates.time.utc().format() : null
                 }
             }
         );
@@ -207,7 +206,7 @@ export class ShareDialogComponent implements OnInit, OnDestroy {
         const { properties } = this.data.node.entry;
 
         properties['qshare:expiryDate'] = updates.time
-            ? updates.time.format()
+            ? updates.time.local()
             : null;
     }
 }