diff --git a/backend/ride/location/get.php b/backend/ride/location/get.php
index 41f9772f..a9ae72ba 100644
--- a/backend/ride/location/get.php
+++ b/backend/ride/location/get.php
@@ -135,9 +135,12 @@ try {
             foreach ($fieldsToDecrypt as $field) {
                 if (isset($row[$field]) && $row[$field] !== null && $row[$field] !== '') {
                     try { 
-                        $row[$field] = $encryptionHelper->decryptData($row[$field]); 
-                    } catch (Exception $e) { 
-                        $row[$field] = null; 
+                        $decrypted = $encryptionHelper->decryptData($row[$field]); 
+                        if ($decrypted !== false && $decrypted !== null) {
+                            $row[$field] = $decrypted;
+                        }
+                    } catch (Throwable $e) { 
+                        // Keep original value if decryption fails
                     }
                 }
             }