diff --git a/app/Console/Commands/InstallModuleCommand.php b/app/Console/Commands/InstallModuleCommand.php
index 20252525d..114bfb105 100644
--- a/app/Console/Commands/InstallModuleCommand.php
+++ b/app/Console/Commands/InstallModuleCommand.php
@@ -213,15 +213,23 @@ class InstallModuleCommand extends Command
                 $redirectLocation = $resp->getHeaderLine('Location');
                 if ($redirectLocation) {
                     $redirectUrl = parse_url($redirectLocation);
-                    if (
-                        ($originalUrl['host'] ?? '') === ($redirectUrl['host'] ?? '')
+                    $redirectOriginMatches = ($originalUrl['host'] ?? '') === ($redirectUrl['host'] ?? '')
                         && ($originalUrl['scheme'] ?? '') === ($redirectUrl['scheme'] ?? '')
-                        && ($originalUrl['port'] ?? '') === ($redirectUrl['port'] ?? '')
-                    ) {
-                        $currentLocation = $redirectLocation;
-                        $redirectCount++;
-                        continue;
+                        && ($originalUrl['port'] ?? '') === ($redirectUrl['port'] ?? '');
+
+                    if (!$redirectOriginMatches) {
+                        $redirectOrigin = ($redirectUrl['scheme'] ?? '') . '://' . ($redirectUrl['host'] ?? '') . (isset($redirectUrl['port']) ? ':' . $redirectUrl['port'] : '');
+                        $this->info("The download URL is redirecting to a different site: {$redirectOrigin}");
+                        $shouldContinue = $this->confirm("Do you trust downloading the module from this site?");
+                        if (!$shouldContinue) {
+                            $this->error("Stopping module installation");
+                            return null;
+                        }
                     }
+
+                    $currentLocation = $redirectLocation;
+                    $redirectCount++;
+                    continue;
                 }
             }
 
diff --git a/tests/Commands/InstallModuleCommandTest.php b/tests/Commands/InstallModuleCommandTest.php
index ee8da1128..c085c4907 100644
--- a/tests/Commands/InstallModuleCommandTest.php
+++ b/tests/Commands/InstallModuleCommandTest.php
@@ -96,18 +96,44 @@ class InstallModuleCommandTest extends TestCase
         });
     }
 
-    public function test_remote_module_install_does_not_follow_redirects_to_different_origin()
+    public function test_remote_module_install_prompts_on_following_redirects_to_different_origin()
     {
         $this->usingThemeFolder(function () {
             $zip = $this->getModuleZipPath();
 
             $http = $this->mockHttpClient([
                 new Response(302, ['Location' => 'http://example.com/a-test-module.zip']),
+                new Response(301, ['Location' => 'https://a.example.com:8080/a-test-module.zip']),
                 new Response(200, ['Content-Length' => filesize($zip)], file_get_contents($zip))
             ]);
 
             $this->artisan('bookstack:install-module', ['location' => 'https://example.com/test-module.zip'])
                 ->expectsConfirmation('Are you sure you trust this source?', 'yes')
+                ->expectsOutput('The download URL is redirecting to a different site: http://example.com')
+                ->expectsConfirmation('Do you trust downloading the module from this site?', 'yes')
+                ->expectsOutput('The download URL is redirecting to a different site: https://a.example.com:8080')
+                ->expectsConfirmation('Do you trust downloading the module from this site?', 'yes')
+                ->assertExitCode(0);
+
+            $this->assertEquals(3, $http->requestCount());
+            $this->assertEquals('https', $http->requestAt(0)->getUri()->getScheme());
+            $this->assertEquals('http', $http->requestAt(1)->getUri()->getScheme());
+            $this->assertEquals('a.example.com', $http->requestAt(2)->getUri()->getHost());
+        });
+    }
+
+    public function test_remote_module_install_redirect_origin_prompt_rejection()
+    {
+        $this->usingThemeFolder(function () {
+            $http = $this->mockHttpClient([
+                new Response(302, ['Location' => 'http://example.com/a-test-module.zip']),
+                new Response(301, ['Location' => 'https://a.example.com:8080/a-test-module.zip']),
+            ]);
+
+            $this->artisan('bookstack:install-module', ['location' => 'https://example.com/test-module.zip'])
+                ->expectsConfirmation('Are you sure you trust this source?', 'yes')
+                ->expectsOutput('The download URL is redirecting to a different site: http://example.com')
+                ->expectsConfirmation('Do you trust downloading the module from this site?', 'no')
                 ->assertExitCode(1);
 
             $this->assertEquals(1, $http->requestCount());
@@ -115,6 +141,26 @@ class InstallModuleCommandTest extends TestCase
         });
     }
 
+    public function test_remote_module_install_has_redirect_limit()
+    {
+        $this->usingThemeFolder(function () {
+            $http = $this->mockHttpClient([
+                new Response(302, ['Location' => 'https://example.com/a-test-module.zip']),
+                new Response(302, ['Location' => 'https://example.com/b-test-module.zip']),
+                new Response(302, ['Location' => 'https://example.com/c-test-module.zip']),
+                new Response(302, ['Location' => 'https://example.com/d-test-module.zip']),
+            ]);
+
+            $this->artisan('bookstack:install-module', ['location' => 'https://example.com/test-module.zip'])
+                ->expectsConfirmation('Are you sure you trust this source?', 'yes')
+                ->expectsOutput('ERROR: Failed to download module from https://example.com/test-module.zip')
+                ->assertExitCode(1);
+
+            $this->assertEquals(4, $http->requestCount());
+            $this->assertEquals('/c-test-module.zip', $http->requestAt(3)->getUri()->getPath());
+        });
+    }
+
     public function test_remote_module_install_download_failures_are_announced_to_user()
     {
         $this->usingThemeFolder(function () {