diff --git a/src/event.ts b/src/event.ts
index cdbabe165..0272b1326 100755
--- a/src/event.ts
+++ b/src/event.ts
@@ -1491,7 +1491,7 @@ export default class ICalEvent {
             }
 
             if (this.data.repeating.until) {
-                g += ';UNTIL=' + formatDate(this.calendar.timezone(), this.data.repeating.until);
+                g += ';UNTIL=' + formatDate(this.calendar.timezone(), this.data.repeating.until, false, this.floating());
             }
 
             if (this.data.repeating.byDay) {
@@ -1534,7 +1534,7 @@ export default class ICalEvent {
                     }
                     else {
                         g += ':' + this.data.repeating.exclude.map(excludedDate => {
-                            return formatDate(this.timezone(), excludedDate);
+                            return formatDate(this.timezone(), excludedDate, false, this.floating());
                         }).join(',') + '\r\n';
                     }
                 }
diff --git a/test/issues.ts b/test/issues.ts
index b3f769604..55d328006 100644
--- a/test/issues.ts
+++ b/test/issues.ts
@@ -210,4 +210,9 @@ describe('Issues', function () {
             ].join('\r\n'));
         });
     });
+
+    describe('Issue #442', function () {
+        it('should generate floating repeat until value if event is a floating event');
+        it('should generate floating repeat exclusion dates if event is a floating event');
+    });
 });