diff --git a/includes/APICore.php b/includes/APICore.php
index a480bef1..0daa352d 100644
--- a/includes/APICore.php
+++ b/includes/APICore.php
@@ -38,8 +38,8 @@ private function setAllowedOriginHeader() {
         if( count( $this->AllowedOrigins ) === 1 && $this->AllowedOrigins[ 0 ] === "*" ) {
             header( 'Access-Control-Allow-Origin: *' );
         }
-        elseif( $this->isAllowedOrigin() ) {
-            header( 'Access-Control-Allow-Origin: ' . $_SERVER['HTTP_ORIGIN'] );
+        else if( $this->isAllowedOrigin() ) {
+            header( 'Access-Control-Allow-Origin: ' . ($_SERVER['HTTP_ORIGIN'] || '*') );
         }
         else {
             header( "Access-Control-Allow-Origin: {$_SERVER['HTTP_HOST']}" );