diff --git a/public/js/grocy_nightmode.js b/public/js/grocy_nightmode.js
index 49a136ef..801499de 100644
--- a/public/js/grocy_nightmode.js
+++ b/public/js/grocy_nightmode.js
@@ -4,6 +4,10 @@
 	if (value)
 	{
 		$("body").addClass("night-mode");
+
+		// Force disable auto night mode when night mode is enabled
+		$("#auto-night-mode-enabled").prop("checked", false);
+		$("#auto-night-mode-enabled").trigger("change");
 	}
 	else
 	{
@@ -21,6 +25,13 @@ $("#auto-night-mode-enabled").on("change", function()
 	{
 		$("body").removeClass("night-mode");
 	}
+
+	// Force disable night mode when auto night mode is enabled
+	if (value)
+	{
+		$("#night-mode-enabled").prop("checked", false);
+		$("#night-mode-enabled").trigger("change");
+	}
 });
 
 $(document).on("keyup", "#auto-night-mode-time-range-from, #auto-night-mode-time-range-to", function()