diff --git a/app/CurrikiGo/Moodle/Playlist.php b/app/CurrikiGo/Moodle/Playlist.php
index 0d48cf027..cba4616c8 100644
--- a/app/CurrikiGo/Moodle/Playlist.php
+++ b/app/CurrikiGo/Moodle/Playlist.php
@@ -47,8 +47,8 @@ public function send(PlaylistModel $playlist, $data)
             "project_id" => $playlist->project_id,
             "tool_url" => config('constants.curriki-tsugi-host'),
             "org_name" => $organizationName,
-            "grade_name" => $grade_name,
-            "subject_name" => $subject_name
+            "grade_name" => $grade_name ? : "None",
+            "subject_name" => $subject_name ? : "None"
         ];
         $response = $this->client->request('GET', $web_service_url, ['query' => $rquest_params]);
         return $response;