diff --git a/assets/js/core/WakaTimeCore.js b/assets/js/core/WakaTimeCore.js
index 787b57d..65b2956 100644
--- a/assets/js/core/WakaTimeCore.js
+++ b/assets/js/core/WakaTimeCore.js
@@ -192,10 +192,10 @@ class WakaTimeCore {
      */
     _preparePayload(entity, type, debug = false) {
         return JSON.stringify({
-            entity: entity,
+            entity: entity.url,
             type: type,
             time: moment().format('X'),
-            project: '<<LAST_PROJECT>>',
+            project: entity.project || '<<LAST_PROJECT>>',
             is_debugging: debug,
             plugin: 'chrome-wakatime/' + config.version
         });