diff --git a/config/install/automatic_updates.settings.yml b/config/install/automatic_updates.settings.yml
index e7c695ec2928d3d1b4e90cee8b5afb9f9ce6c584..87210fd7ff262d69e064eb240acd47be10d8cff4 100644
--- a/config/install/automatic_updates.settings.yml
+++ b/config/install/automatic_updates.settings.yml
@@ -1,7 +1,4 @@
-# Public service announcement URI endpoint.
-# TODO:  Update to correct end point once it is available. See
-# https://www.drupal.org/project/automatic_updates/issues/3045273
-psa_endpoint: 'http://example.com/automatic_updates/test-json'
+psa_endpoint: 'https://updates.drupal.org/psa.json'
 enable_psa: true
 notify: true
 check_frequency: 43200
diff --git a/src/Services/AutomaticUpdatesPsa.php b/src/Services/AutomaticUpdatesPsa.php
index e0e0d12f8baf16beafd57b5ed9e8b6b7572cfeb8..e082085251a7dc7d01dbcf90d6aacdd25924d989 100644
--- a/src/Services/AutomaticUpdatesPsa.php
+++ b/src/Services/AutomaticUpdatesPsa.php
@@ -136,7 +136,7 @@ class AutomaticUpdatesPsa implements AutomaticUpdatesPsaInterface {
 
     try {
       $json_payload = json_decode($response);
-      if ($json_payload) {
+      if (!is_null($json_payload)) {
         foreach ($json_payload as $json) {
           if ($json->is_psa && ($json->type === 'core' || $this->isValidExtension($json->type, $json->project))) {
             $messages[] = $this->message($json->title, $json->link);