diff --git a/modules/programs/firefox/mkFirefoxModule.nix b/modules/programs/firefox/mkFirefoxModule.nix
index a36db370..831f59dd 100644
--- a/modules/programs/firefox/mkFirefoxModule.nix
+++ b/modules/programs/firefox/mkFirefoxModule.nix
@@ -847,9 +847,9 @@ in {
 
     home.packages = lib.optional (cfg.finalPackage != null) cfg.finalPackage;
 
-    mozilla.firefoxNativeMessagingHosts = [
-      cfg.finalPackage # package configured native messaging hosts (entire browser actually)
-    ] ++ cfg.nativeMessagingHosts; # user configured native messaging hosts
+    mozilla.firefoxNativeMessagingHosts = cfg.nativeMessagingHosts
+      # package configured native messaging hosts (entire browser actually)
+      ++ (lib.optional (cfg.finalPackage != null) cfg.finalPackage);
 
     home.file = mkMerge ([{
       "${cfg.configPath}/profiles.ini" =
diff --git a/tests/modules/programs/firefox/common.nix b/tests/modules/programs/firefox/common.nix
index c92db1e4..939eab94 100644
--- a/tests/modules/programs/firefox/common.nix
+++ b/tests/modules/programs/firefox/common.nix
@@ -1,6 +1,7 @@
 name:
 builtins.mapAttrs (test: module: import module [ "programs" name ]) {
   "${name}-deprecated-native-messenger" = ./deprecated-native-messenger.nix;
+  "${name}-null-package" = ./null-package.nix;
   "${name}-final-package" = ./final-package.nix;
   "${name}-policies" = ./policies.nix;
   "${name}-profiles-bookmarks" = ./profiles/bookmarks;
diff --git a/tests/modules/programs/firefox/null-package.nix b/tests/modules/programs/firefox/null-package.nix
new file mode 100644
index 00000000..e5d1516d
--- /dev/null
+++ b/tests/modules/programs/firefox/null-package.nix
@@ -0,0 +1,10 @@
+modulePath:
+{ config, lib, ... }:
+
+lib.mkIf config.test.enableBig (lib.setAttrByPath modulePath { enable = true; }
+  // {
+    programs.firefox = {
+      enable = true;
+      package = null;
+    };
+  })