diff --git a/modules/comment-likes.php b/modules/comment-likes.php
index c884b8e9c75f9..4fd73751adc8d 100644
--- a/modules/comment-likes.php
+++ b/modules/comment-likes.php
@@ -38,7 +38,7 @@ private function __construct() {
 		$this->url_parts = parse_url( $this->url );
 		$this->domain    = $this->url_parts['host'];
 
-		add_action( 'init', array( $this, 'frontend_init' ) );
+		add_action( 'template_redirect', array( $this, 'frontend_init' ) );
 		add_action( 'admin_init', array( $this, 'admin_init' ) );
 
 		if ( ! Jetpack::is_module_active( 'likes' ) ) {
@@ -117,10 +117,6 @@ public function add_like_count_column( $columns ) {
 	}
 
 	public function frontend_init() {
-		if ( is_admin() ) {
-			return;
-		}
-
 		if ( Jetpack_AMP_Support::is_amp_request() ) {
 			return;
 		}