diff --git a/extensions/shared/src/main/java/app/revanced/extension/youtube/patches/shorts/ShortsPatch.java b/extensions/shared/src/main/java/app/revanced/extension/youtube/patches/shorts/ShortsPatch.java
index 9125a2138..91f142099 100644
--- a/extensions/shared/src/main/java/app/revanced/extension/youtube/patches/shorts/ShortsPatch.java
+++ b/extensions/shared/src/main/java/app/revanced/extension/youtube/patches/shorts/ShortsPatch.java
@@ -21,6 +21,7 @@ import app.revanced.extension.shared.utils.Utils;
 import app.revanced.extension.youtube.settings.Settings;
 import app.revanced.extension.youtube.shared.ShortsPlayerState;
 import app.revanced.extension.youtube.utils.VideoUtils;
+import kotlin.Unit;
 
 @SuppressWarnings("unused")
 public class ShortsPatch {
@@ -34,7 +35,7 @@ public class ShortsPatch {
         if (HIDE_SHORTS_NAVIGATION_BAR) {
             ShortsPlayerState.getOnChange().addObserver((ShortsPlayerState state) -> {
                 setNavigationBarLayoutParams(state);
-                return null;
+                return Unit.INSTANCE;
             });
         }
         final int bottomMargin = validateValue(
diff --git a/extensions/shared/src/main/java/app/revanced/extension/youtube/sponsorblock/ui/SponsorBlockViewController.java b/extensions/shared/src/main/java/app/revanced/extension/youtube/sponsorblock/ui/SponsorBlockViewController.java
index bccbbd3e6..8eed690d5 100644
--- a/extensions/shared/src/main/java/app/revanced/extension/youtube/sponsorblock/ui/SponsorBlockViewController.java
+++ b/extensions/shared/src/main/java/app/revanced/extension/youtube/sponsorblock/ui/SponsorBlockViewController.java
@@ -23,6 +23,7 @@ import app.revanced.extension.youtube.patches.player.PlayerPatch;
 import app.revanced.extension.youtube.settings.Settings;
 import app.revanced.extension.youtube.shared.PlayerType;
 import app.revanced.extension.youtube.sponsorblock.objects.SponsorSegment;
+import kotlin.Unit;
 
 @SuppressWarnings("unused")
 public class SponsorBlockViewController {
@@ -44,7 +45,7 @@ public class SponsorBlockViewController {
     static {
         PlayerType.getOnChange().addObserver((PlayerType type) -> {
             playerTypeChanged(type);
-            return null;
+            return Unit.INSTANCE;
         });
 
         defaultBottomMargin = getDimension("brand_interaction_default_bottom_margin");