diff --git a/Vote.js b/Vote.js
index 70226cd..09444da 100644
--- a/Vote.js
+++ b/Vote.js
@@ -173,7 +173,7 @@ $( function() {
 		var that = $( this );
 		vote.clickVoteStars(
 			that.data( 'vote-the-vote' ),
-			mw.config.get( 'wgArticleId' ),
+			$( this ).data( 'page-id' ),
 			that.data( 'vote-id' ),
 			that.data( 'vote-action' )
 		);
@@ -196,7 +196,7 @@ $( function() {
 	// Remove vote (rating stars)
 	$( 'body' ).on( 'click', '.vote-remove-stars-link', function() {
 		vote.unVoteStars(
-			mw.config.get( 'wgArticleId' ),
+			$( this ).data( 'page-id' ),
 			$( this ).data( 'vote-id' )
 		);
 	} );
diff --git a/VoteClass.php b/VoteClass.php
index dd45593..db720b1 100644
--- a/VoteClass.php
+++ b/VoteClass.php
@@ -291,7 +291,7 @@ class VoteStars extends Vote {
 			$output .= '<div class="rating-voted">' .
 				wfMessage( 'voteny-gave-this', $already_voted )->parse() .
 			" </div>
-			<a href=\"javascript:void(0);\" class=\"vote-remove-stars-link\" data-vote-id=\"{$id}\">("
+			<a href=\"javascript:void(0);\" class=\"vote-remove-stars-link\" data-page-id=\"{$this->PageID}\" data-vote-id=\"{$id}\">("
 				. wfMessage( 'voteny-remove' )->plain() .
 			')</a>';
 		}
@@ -329,6 +329,7 @@ class VoteStars extends Vote {
 				$action = 5;
 			}
 			$output .= "<img class=\"vote-rating-star\" data-vote-the-vote=\"{$x}\"" .
+				" data-page-id=\"{$this->PageID}\"" .
 				" data-vote-id=\"{$id}\" data-vote-action=\"{$action}\" data-vote-rating=\"{$rating}\"" .
 				" data-vote-voted=\"{$voted}\" id=\"rating_{$id}_{$x}\"" .
 				" src=\"{$wgExtensionAssetsPath}/VoteNY/images/star_";