diff --git a/src/Service/RiderAPIHandler/CMBRiderAPIHandler.php b/src/Service/RiderAPIHandler/CMBRiderAPIHandler.php
index 3291a6a1..abbb7dde 100644
--- a/src/Service/RiderAPIHandler/CMBRiderAPIHandler.php
+++ b/src/Service/RiderAPIHandler/CMBRiderAPIHandler.php
@@ -2213,6 +2213,10 @@ class CMBRiderAPIHandler implements RiderAPIHandlerInterface
 
     protected function getURLExtraImage(Request $req, $filename)
     {
+        // return null if blank filename
+        if (strlen(trim($filename)) <= 0)
+            return null;
+
         return $req->getScheme() . '://' . $req->getHttpHost() . $req->getBasePath() . '/uploads/jo_extra/' . $filename;
     }
 }