diff --git a/lib/plugin.php b/lib/plugin.php
index 1ca5deb5c5..2b34834577 100644
--- a/lib/plugin.php
+++ b/lib/plugin.php
@@ -146,7 +146,8 @@ class Plugin
         if (is_null($server)) {
             if ($isHTTPS) {
                 $server = common_config('site', 'sslserver');
-            } else {
+            }
+            if (is_null($server)) {
                 $server = common_config('site', 'server');
             }
         }