diff --git a/wsd/HostUtil.cpp b/wsd/HostUtil.cpp
index f0486c7e0..b418558ad 100644
--- a/wsd/HostUtil.cpp
+++ b/wsd/HostUtil.cpp
@@ -59,6 +59,8 @@ bool HostUtil::allowedWopiHost(const std::string& host)
 
 void HostUtil::parseAliases(Poco::Util::LayeredConfiguration& conf)
 {
+    WopiEnabled = conf.getBool("storage.wopi[@allow]", false);
+
     //set alias_groups mode to compat
     if (!conf.has("storage.wopi.alias_groups"))
     {
diff --git a/wsd/Storage.cpp b/wsd/Storage.cpp
index 051dd1ca6..d92db8e0c 100644
--- a/wsd/Storage.cpp
+++ b/wsd/Storage.cpp
@@ -90,7 +90,11 @@ void StorageBase::initialize()
     const auto& app = Poco::Util::Application::instance();
     FilesystemEnabled = app.config().getBool("storage.filesystem[@allow]", false);
 
-    HostUtil::parseWopiHost(app.config());
+    //parse wopi.storage.host only when there is no storage.wopi.alias_groups entry in config
+    if (!app.config().has("storage.wopi.alias_groups"))
+    {
+        HostUtil::parseWopiHost(app.config());
+    }
 
 #ifdef ENABLE_FEATURE_LOCK
     CommandControl::LockManager::parseLockedHost(app.config());