diff --git a/packages/cli/src/plugins/resource/plugin-content-as-data.js b/packages/cli/src/plugins/resource/plugin-content-as-data.js
index bb07fbed8..b4963fa7f 100644
--- a/packages/cli/src/plugins/resource/plugin-content-as-data.js
+++ b/packages/cli/src/plugins/resource/plugin-content-as-data.js
@@ -87,7 +87,10 @@ class ContentAsDataResource extends ResourceInterface {
     let newBody = body;
 
     if (contentAsData) {
-      newBody = mergeImportMap(body, importMap, polyfills.importMaps);
+      if (process.env.__GWD_COMMAND__ === 'develop') { // eslint-disable-line no-underscore-dangle
+        newBody = mergeImportMap(body, importMap, polyfills.importMaps);
+      }
+
       newBody = newBody.replace('<head>', `
         <head>
           <script id="content-server">
diff --git a/packages/cli/test/cases/build.config.prerender-collections/build.config.prerender-collections.spec.js b/packages/cli/test/cases/build.config.prerender-collections/build.config.prerender-collections.spec.js
index 53600030b..087d05d0e 100644
--- a/packages/cli/test/cases/build.config.prerender-collections/build.config.prerender-collections.spec.js
+++ b/packages/cli/test/cases/build.config.prerender-collections/build.config.prerender-collections.spec.js
@@ -49,7 +49,7 @@ describe('Build Greenwood With: ', function() {
     this.context = {
       publicDir: path.join(outputPath, 'public')
     };
-    runner = new Runner();
+    runner = new Runner(true);
   });
 
   describe(LABEL, function() {
@@ -93,6 +93,18 @@ describe('Build Greenwood With: ', function() {
         dom = await JSDOM.fromFile(path.resolve(this.context.publicDir, './index.html'));
       });
 
+      describe('Data Client Import Map', () => {
+        let map;
+
+        before(function() {
+          map = dom.window.document.querySelectorAll('script[type="importmap"]');
+        });
+
+        it('should not have a <script> tag of type importmap', async () => {
+          expect(map.length).to.equal(0);
+        });
+      });
+
       describe('navigation links from getContentByCollection', function() {
         let navLinks;
 
diff --git a/packages/cli/test/cases/develop.config.config-as-data/develop.config.content-as-data.spec.js b/packages/cli/test/cases/develop.config.config-as-data/develop.config.content-as-data.spec.js
index 8ab877390..0382b8372 100644
--- a/packages/cli/test/cases/develop.config.config-as-data/develop.config.content-as-data.spec.js
+++ b/packages/cli/test/cases/develop.config.config-as-data/develop.config.content-as-data.spec.js
@@ -31,6 +31,7 @@
  */
 
 import chai from 'chai';
+import { JSDOM } from 'jsdom';
 import path from 'path';
 import { getSetupFiles, getOutputTeardownFiles } from '../../../../../test/utils.js';
 import { Runner } from 'gallinago';
@@ -69,6 +70,29 @@ describe('Develop Greenwood With: ', function() {
       });
     });
 
+    describe('Data Client Import Map', () => {
+      let response;
+      let dom;
+
+      before(async function() {
+        response = await fetch(`${hostname}:${port}/`);
+        dom = new JSDOM(await response.text());
+      });
+
+      it('should have a <script> tag of type importmap', async () => {
+        const map = dom.window.document.querySelectorAll('script[type="importmap"]');
+
+        expect(map.length).to.equal(1);
+      });
+
+      it('should have the expected entry in the importmap', async () => {
+        const map = dom.window.document.querySelectorAll('script[type="importmap"]');
+        const contents = JSON.parse(map[0].textContent);
+
+        expect(contents.imports['@greenwood/cli/src/data/client.js']).to.equal('/node_modules/@greenwood/cli/src/data/client.js');
+      });
+    });
+
     describe('Content Request Types', () => {
       describe('Graph Request', () => {
         let response;
