diff --git a/openpype/settings/entities/op_version_entity.py b/openpype/settings/entities/op_version_entity.py
index 6184f7640a..782d65a446 100644
--- a/openpype/settings/entities/op_version_entity.py
+++ b/openpype/settings/entities/op_version_entity.py
@@ -72,6 +72,8 @@ class ProductionVersionsInputEntity(OpenPypeVersionInput):
 
     def _get_openpype_versions(self):
         versions = get_remote_versions(staging=False, production=True)
+        if versions is None:
+            return []
         versions.append(get_installed_version())
         return sorted(versions)
 
@@ -82,4 +84,6 @@ class StagingVersionsInputEntity(OpenPypeVersionInput):
 
     def _get_openpype_versions(self):
         versions = get_remote_versions(staging=True, production=False)
+        if versions is None:
+            return []
         return sorted(versions)