diff --git a/app/code/Magento/Version/Controller/Index/Index.php b/app/code/Magento/Version/Controller/Index/Index.php
index 512dbe13ab3c0..6123ed32bd754 100644
--- a/app/code/Magento/Version/Controller/Index/Index.php
+++ b/app/code/Magento/Version/Controller/Index/Index.php
@@ -1,7 +1,7 @@
 <?php
 /**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
+ * Copyright 2015 Adobe
+ * All Rights Reserved.
  */
 declare(strict_types=1);
 
@@ -10,7 +10,9 @@
 use Magento\Framework\App\Action\Action;
 use Magento\Framework\App\Action\Context;
 use Magento\Framework\App\Action\HttpGetActionInterface;
+use Magento\Framework\App\ObjectManager;
 use Magento\Framework\App\ProductMetadataInterface;
+use Magento\Framework\App\State as AppState;
 use Magento\Framework\Controller\Result\RawFactory as RawResponseFactory;
 
 /**
@@ -30,19 +32,27 @@ class Index extends Action implements HttpGetActionInterface
      */
     private $rawFactory;
 
+    /**
+     * @var AppState
+     */
+    private $appState;
+
     /**
      * @param Context $context
      * @param RawResponseFactory $rawFactory
      * @param ProductMetadataInterface $productMetadata
+     * @param AppState $appState
      */
     public function __construct(
         Context $context,
         RawResponseFactory $rawFactory,
-        ProductMetadataInterface $productMetadata
+        ProductMetadataInterface $productMetadata,
+        AppState $appState = null
     ) {
         parent::__construct($context);
         $this->rawFactory = $rawFactory;
         $this->productMetadata = $productMetadata;
+        $this->appState = $appState ?: ObjectManager::getInstance()->get(AppState::class);
     }
 
     /**
@@ -55,11 +65,12 @@ public function execute()
         $version = $this->productMetadata->getVersion() ?? '';
         $versionParts = explode('.', $version);
         if (!$this->isGitBasedInstallation($version) && $this->isCorrectVersion($versionParts)) {
-            $rawResponse->setContents(
-                $this->productMetadata->getName() . '/' .
-                $this->getMajorMinorVersion($versionParts) .
-                ' (' . $this->productMetadata->getEdition() . ')'
-            );
+            $content = $this->productMetadata->getName();
+            if ($this->appState->getMode() != AppState::MODE_PRODUCTION) {
+                $content .= '/' . $this->getMajorMinorVersion($versionParts) .
+                ' (' . $this->productMetadata->getEdition() . ')';
+            }
+            $rawResponse->setContents($content);
         }
 
         return $rawResponse;
diff --git a/app/code/Magento/Version/Test/Unit/Controller/Index/IndexTest.php b/app/code/Magento/Version/Test/Unit/Controller/Index/IndexTest.php
index 045cb4c40267e..eb27230064bf5 100644
--- a/app/code/Magento/Version/Test/Unit/Controller/Index/IndexTest.php
+++ b/app/code/Magento/Version/Test/Unit/Controller/Index/IndexTest.php
@@ -1,7 +1,7 @@
 <?php
 /**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
+ * Copyright 2019 Adobe
+ * All Rights Reserved.
  */
 declare(strict_types=1);
 
@@ -9,6 +9,7 @@
 
 use Magento\Framework\App\Action\Context;
 use Magento\Framework\App\ProductMetadataInterface;
+use Magento\Framework\App\State as AppState;
 use Magento\Framework\Controller\Result\Raw;
 use Magento\Framework\Controller\Result\RawFactory;
 use Magento\Version\Controller\Index\Index as VersionIndex;
@@ -23,6 +24,9 @@ class IndexTest extends TestCase
     /** @var MockObject|ProductMetadataInterface */
     private $productMetadataMock;
 
+    /** @var MockObject|AppState */
+    private $appStateMock;
+
     /** @var MockObject|RawFactory */
     private $rawResponseFactoryMock;
 
@@ -44,6 +48,8 @@ protected function setUp(): void
             ->onlyMethods(['getName', 'getEdition', 'getVersion'])
             ->getMockForAbstractClass();
 
+        $this->appStateMock = $this->createMock(AppState::class);
+
         $this->rawResponseFactoryMock = $this->createPartialMock(RawFactory::class, ['create']);
         $this->rawResponseMock = $this->createPartialMock(Raw::class, ['setContents']);
         $this->rawResponseFactoryMock->method('create')->willReturn($this->rawResponseMock);
@@ -51,7 +57,8 @@ protected function setUp(): void
         $this->versionController = new VersionIndex(
             $this->contextMock,
             $this->rawResponseFactoryMock,
-            $this->productMetadataMock
+            $this->productMetadataMock,
+            $this->appStateMock
         );
     }
 
@@ -85,4 +92,19 @@ public function testCommunityVersionDisplaysMajorMinorVersionAndEditionName(): v
 
         $this->versionController->execute();
     }
+
+    public function testCommunityVersionDisplaysMajorMinorVersionAndEditionNameProductionMode(): void
+    {
+        $this->productMetadataMock->expects($this->any())->method('getVersion')->willReturn('2.3.3');
+        $this->productMetadataMock->expects($this->any())->method('getEdition')->willReturn('Community');
+        $this->productMetadataMock->expects($this->any())->method('getName')->willReturn('Magento');
+
+        $this->appStateMock->expects($this->any())->method('getMode')->willReturn(AppState::MODE_PRODUCTION);
+
+        $this->rawResponseMock->expects($this->once())->method('setContents')
+            ->with('Magento')
+            ->willReturnSelf();
+
+        $this->versionController->execute();
+    }
 }