diff --git a/system/src/Grav/Common/GPM/Remote/Plugins.php b/system/src/Grav/Common/GPM/Remote/Plugins.php
index 17b6a7f35..e32cb7b4f 100644
--- a/system/src/Grav/Common/GPM/Remote/Plugins.php
+++ b/system/src/Grav/Common/GPM/Remote/Plugins.php
@@ -12,7 +12,7 @@ class Plugins extends AbstractPackageCollection
      */
     protected $type = 'plugins';
 
-    protected $repository = 'https://getgrav.org/downloads/plugins.json?v=' . GRAV_VERSION;
+    protected $repository = 'https://getgrav.org/downloads/plugins.json?v=';
 
     /**
      * Local Plugins Constructor
@@ -21,6 +21,8 @@ class Plugins extends AbstractPackageCollection
      */
     public function __construct($refresh = false, $callback = null)
     {
+        $this->repository .= GRAV_VERSION;
+
         parent::__construct($this->repository, $refresh, $callback);
     }
 }
diff --git a/system/src/Grav/Common/GPM/Remote/Themes.php b/system/src/Grav/Common/GPM/Remote/Themes.php
index e5008dc87..637e20431 100644
--- a/system/src/Grav/Common/GPM/Remote/Themes.php
+++ b/system/src/Grav/Common/GPM/Remote/Themes.php
@@ -12,7 +12,7 @@ class Themes extends AbstractPackageCollection
      */
     protected $type = 'themes';
 
-    protected $repository = 'https://getgrav.org/downloads/themes.json?v=' . GRAV_VERSION;
+    protected $repository = 'https://getgrav.org/downloads/themes.json?v=';
 
     /**
      * Local Themes Constructor
@@ -21,6 +21,8 @@ class Themes extends AbstractPackageCollection
      */
     public function __construct($refresh = false, $callback = null)
     {
+        $this->repository .= GRAV_VERSION;
+
         parent::__construct($this->repository, $refresh, $callback);
     }
 }