diff --git a/source/java/org/alfresco/repo/quickshare/QuickShareServiceImpl.java b/source/java/org/alfresco/repo/quickshare/QuickShareServiceImpl.java
index 14ad841f06..7e3e324d6d 100644
--- a/source/java/org/alfresco/repo/quickshare/QuickShareServiceImpl.java
+++ b/source/java/org/alfresco/repo/quickshare/QuickShareServiceImpl.java
@@ -1217,8 +1217,6 @@ public class QuickShareServiceImpl implements QuickShareService,
         // first set the scheduledAction so we can set the other information
         expiryAction.setSchedule(schedule);
         expiryAction.setScheduleStart(expiryDate);
-        expiryAction.setScheduleIntervalCount(2);
-        expiryAction.setScheduleIntervalPeriod(IntervalPeriod.Minute);
 
         try
         {
diff --git a/source/test-java/org/alfresco/repo/quickshare/QuickShareServiceIntegrationTest.java b/source/test-java/org/alfresco/repo/quickshare/QuickShareServiceIntegrationTest.java
index 61463b0016..cf35990064 100644
--- a/source/test-java/org/alfresco/repo/quickshare/QuickShareServiceIntegrationTest.java
+++ b/source/test-java/org/alfresco/repo/quickshare/QuickShareServiceIntegrationTest.java
@@ -620,8 +620,8 @@ public class QuickShareServiceIntegrationTest
         QuickShareLinkExpiryAction expiryAction = getExpiryActionAndAttachSchedule(quickShareDTO.getId());
         assertEquals(quickShareDTO.getId(), expiryAction.getSharedId());
         assertEquals(quickShareDTO.getExpiresAt(), expiryAction.getScheduleStart());
-       // assertNull("We haven't set interval count.", expiryAction.getScheduleIntervalCount());
-        //assertNull("We haven't set interval period.", expiryAction.getScheduleIntervalPeriod());
+        assertNull("We haven't set interval count.", expiryAction.getScheduleIntervalCount());
+        assertNull("We haven't set interval period.", expiryAction.getScheduleIntervalPeriod());
 
         // Try to share the already shared node with a different expiry date.
         // This basically will update the expiry action start time
@@ -635,8 +635,8 @@ public class QuickShareServiceIntegrationTest
         expiryAction = getExpiryActionAndAttachSchedule(quickShareDTO.getId());
         assertEquals(quickShareDTO.getId(), expiryAction.getSharedId());
         assertEquals(quickShareDTO.getExpiresAt(), expiryAction.getScheduleStart());
-        //assertNull("We haven't set interval count.", expiryAction.getScheduleIntervalCount());
-       // assertNull("We haven't set interval period.", expiryAction.getScheduleIntervalPeriod());
+        assertNull("We haven't set interval count.", expiryAction.getScheduleIntervalCount());
+        assertNull("We haven't set interval period.", expiryAction.getScheduleIntervalPeriod());
 
         // Delete the expiry action
         deleteExpiryAction(expiryAction);