diff --git a/lib/FreeBusyGenerator.php b/lib/FreeBusyGenerator.php
index 42482603..5e30805e 100644
--- a/lib/FreeBusyGenerator.php
+++ b/lib/FreeBusyGenerator.php
@@ -521,12 +521,7 @@ protected function generateFreeBusyCalendar(FreeBusyData $fbData): VCalendar
                 'FREEBUSY',
                 $busyTime[0]->format('Ymd\\THis\\Z').'/'.$busyTime[1]->format('Ymd\\THis\\Z')
             );
-
-            // Only setting FBTYPE if it's not BUSY, because BUSY is the
-            // default anyway.
-            if ('BUSY' !== $busyType) {
-                $prop['FBTYPE'] = $busyType;
-            }
+            $prop['FBTYPE'] = $busyType;
             $vfreebusy->add($prop);
         }
 
diff --git a/tests/VObject/FreeBusyGeneratorTest.php b/tests/VObject/FreeBusyGeneratorTest.php
index a4946cc1..d1df7573 100644
--- a/tests/VObject/FreeBusyGeneratorTest.php
+++ b/tests/VObject/FreeBusyGeneratorTest.php
@@ -94,7 +94,7 @@ public function testSimple(): void
 ICS;
 
         self::assertFreeBusyReport(
-            'FREEBUSY:20110101T120000Z/20110101T130000Z',
+            'FREEBUSY;FBTYPE=BUSY:20110101T120000Z/20110101T130000Z',
             $blob
         );
     }
@@ -115,7 +115,7 @@ public function testSource(): void
         rewind($h);
 
         self::assertFreeBusyReport(
-            'FREEBUSY:20110101T120000Z/20110101T130000Z',
+            'FREEBUSY;FBTYPE=BUSY:20110101T120000Z/20110101T130000Z',
             $h
         );
     }
@@ -137,7 +137,7 @@ public function testOpaque(): void
 ICS;
 
         self::assertFreeBusyReport(
-            'FREEBUSY:20110101T130000Z/20110101T140000Z',
+            'FREEBUSY;FBTYPE=BUSY:20110101T130000Z/20110101T140000Z',
             $blob
         );
     }
@@ -272,7 +272,7 @@ public function testDuration(): void
 ICS;
 
         self::assertFreeBusyReport(
-            'FREEBUSY:20110101T190000Z/20110101T200000Z',
+            'FREEBUSY;FBTYPE=BUSY:20110101T190000Z/20110101T200000Z',
             $blob
         );
     }
@@ -293,7 +293,7 @@ public function testAllDay(): void
 ICS;
 
         self::assertFreeBusyReport(
-            'FREEBUSY:20110102T000000Z/20110103T000000Z',
+            'FREEBUSY;FBTYPE=BUSY:20110102T000000Z/20110103T000000Z',
             $blob
         );
     }
@@ -336,7 +336,7 @@ public function testObject(): void
 ICS;
 
         self::assertFreeBusyReport(
-            'FREEBUSY:20110101T210000Z/20110101T220000Z',
+            'FREEBUSY;FBTYPE=BUSY:20110101T210000Z/20110101T220000Z',
             Reader::read($blob)
         );
     }
@@ -360,8 +360,8 @@ public function testVFreeBusy(): void
 ICS;
 
         self::assertFreeBusyReport(
-            "FREEBUSY:20110103T010000Z/20110103T020000Z\n".
-            'FREEBUSY:20110103T030000Z/20110103T060000Z',
+            "FREEBUSY;FBTYPE=BUSY:20110103T010000Z/20110103T020000Z\n".
+            'FREEBUSY;FBTYPE=BUSY:20110103T030000Z/20110103T060000Z',
             $blob
         );
     }
@@ -381,7 +381,7 @@ public function testYearlyRecurrence(): void
 ICS;
 
         self::assertFreeBusyReport(
-            'FREEBUSY:20110101T220000Z/20110101T230000Z',
+            'FREEBUSY;FBTYPE=BUSY:20110101T220000Z/20110101T230000Z',
             $blob
         );
     }
@@ -401,7 +401,7 @@ public function testYearlyRecurrenceDuration(): void
 ICS;
 
         self::assertFreeBusyReport(
-            'FREEBUSY:20110101T230000Z/20110102T000000Z',
+            'FREEBUSY;FBTYPE=BUSY:20110101T230000Z/20110102T000000Z',
             $blob
         );
     }
@@ -420,7 +420,7 @@ public function testFloatingTime(): void
 ICS;
 
         self::assertFreeBusyReport(
-            'FREEBUSY:20110101T120000Z/20110101T130000Z',
+            'FREEBUSY;FBTYPE=BUSY:20110101T120000Z/20110101T130000Z',
             $blob
         );
     }
@@ -439,7 +439,7 @@ public function testFloatingTimeReferenceTimeZone(): void
 ICS;
 
         self::assertFreeBusyReport(
-            'FREEBUSY:20110101T170000Z/20110101T180000Z',
+            'FREEBUSY;FBTYPE=BUSY:20110101T170000Z/20110101T180000Z',
             $blob,
             new \DateTimeZone('America/Toronto')
         );
@@ -458,7 +458,7 @@ public function testAllDay2(): void
 ICS;
 
         self::assertFreeBusyReport(
-            'FREEBUSY:20110101T110000Z/20110102T000000Z',
+            'FREEBUSY;FBTYPE=BUSY:20110101T110000Z/20110102T000000Z',
             $blob
         );
     }
@@ -476,7 +476,7 @@ public function testAllDayReferenceTimeZone(): void
 ICS;
 
         self::assertFreeBusyReport(
-            'FREEBUSY:20110101T110000Z/20110102T050000Z',
+            'FREEBUSY;FBTYPE=BUSY:20110101T110000Z/20110102T050000Z',
             $blob,
             new \DateTimeZone('America/Toronto')
         );
@@ -534,7 +534,7 @@ public function testVAvailabilitySimple(): void
 
         self::assertFreeBusyReport(
             "FREEBUSY;FBTYPE=BUSY-UNAVAILABLE:20110101T110000Z/20110101T120000Z\n".
-            "FREEBUSY:20110101T120000Z/20110101T130000Z\n".
+            "FREEBUSY;FBTYPE=BUSY:20110101T120000Z/20110101T130000Z\n".
             'FREEBUSY;FBTYPE=BUSY-UNAVAILABLE:20110101T130000Z/20110103T110000Z',
             $blob,
             null,
@@ -572,7 +572,7 @@ public function testVAvailabilityIrrelevant(): void
 ICS;
 
         self::assertFreeBusyReport(
-            'FREEBUSY:20110101T120000Z/20110101T130000Z',
+            'FREEBUSY;FBTYPE=BUSY:20110101T120000Z/20110101T130000Z',
             $blob,
             null,
             $vavail
@@ -612,7 +612,7 @@ public function testVAvailabilityOfficeHours(): void
 
         self::assertFreeBusyReport(
             "FREEBUSY;FBTYPE=BUSY-TENTATIVE:20110101T110000Z/20110101T120000Z\n".
-            "FREEBUSY:20110101T120000Z/20110101T130000Z\n".
+            "FREEBUSY;FBTYPE=BUSY:20110101T120000Z/20110101T130000Z\n".
             "FREEBUSY;FBTYPE=BUSY-TENTATIVE:20110101T130000Z/20110103T090000Z\n",
             $blob,
             null,
@@ -659,7 +659,7 @@ public function testVAvailabilityOfficeHoursVacation(): void
 ICS;
 
         self::assertFreeBusyReport(
-            'FREEBUSY:20110101T110000Z/20110103T110000Z',
+            'FREEBUSY;FBTYPE=BUSY:20110101T110000Z/20110103T110000Z',
             $blob,
             null,
             $vavail
@@ -708,7 +708,7 @@ public function testVAvailabilityOfficeHoursVacation2(): void
 
         self::assertFreeBusyReport(
             "FREEBUSY;FBTYPE=BUSY-TENTATIVE:20110101T110000Z/20110101T120000Z\n".
-            "FREEBUSY:20110101T120000Z/20110101T130000Z\n".
+            "FREEBUSY;FBTYPE=BUSY:20110101T120000Z/20110101T130000Z\n".
             "FREEBUSY;FBTYPE=BUSY-TENTATIVE:20110101T130000Z/20110103T090000Z\n",
             $blob,
             null,