diff --git a/pki/icinga2-setup-agent.cmake b/pki/icinga2-setup-agent.cmake
index 5d05da8c1..501970f06 100644
--- a/pki/icinga2-setup-agent.cmake
+++ b/pki/icinga2-setup-agent.cmake
@@ -183,8 +183,10 @@ AGENT
 	echo "Enabling agent feature..."
 	@CMAKE_INSTALL_FULL_SBINDIR@/icinga2-enable-feature agent
 
-	echo "Disabling notification feature..."
-	@CMAKE_INSTALL_FULL_SBINDIR@/icinga2-disable-feature notification
+	if [ "$master" = "n" ]; then
+		echo "Disabling notification feature..."
+		@CMAKE_INSTALL_FULL_SBINDIR@/icinga2-disable-feature notification
+	fi
 
 	echo ""
 	echo "The key bundle was installed successfully and the agent component"