diff --git a/src/MooCommand/Command/Workspace/Create.php b/src/MooCommand/Command/Workspace/Create.php
index 56a39cd..a95cc8e 100644
--- a/src/MooCommand/Command/Workspace/Create.php
+++ b/src/MooCommand/Command/Workspace/Create.php
@@ -104,6 +104,7 @@ protected function updateWebEnvFile($sitePath)
     {
         // Highest port plus 1 && site name
         $port = max($this->getUsedPorts()) + 1;
+        $solrPort = max($this->getUsedPorts('SOLR_PORT')) + 1;
         $name = $this->argument('name');
 
         // Open file for reading & replace host & port
@@ -112,6 +113,7 @@ protected function updateWebEnvFile($sitePath)
         $contents = strtr($contents, [
             'site1' => $name,
             '1000'  => $port,
+            '8983'  => $solrPort,
         ]);
         $envFile = null;