diff --git a/app/assets/javascripts/invite_members/components/invite_modal_base.vue b/app/assets/javascripts/invite_members/components/invite_modal_base.vue
index c56668748f290d9b3455972de233144616b3e9e9..3071dee38fa90020a215ff370bbc395019244cd2 100644
--- a/app/assets/javascripts/invite_members/components/invite_modal_base.vue
+++ b/app/assets/javascripts/invite_members/components/invite_modal_base.vue
@@ -341,7 +341,7 @@ export default {
               <div :class="{ 'gl-font-weight-bold': item.memberRoleId }">{{ item.text }}</div>
               <div
                 v-if="item.description"
-                class="gl-text-gray-700 gl-font-sm gl-pt-1 gl-line-clamp-2"
+                class="gl-text-gray-700 gl-font-sm gl-pt-1 gl-line-clamp-2 gl-whitespace-normal"
               >
                 {{ item.description }}
               </div>
diff --git a/app/assets/javascripts/members/components/table/max_role.vue b/app/assets/javascripts/members/components/table/max_role.vue
index 5336a0c3d27271d541c87ea1d650642793535ce5..51a878245609534c1b03223af3c202fabc36469f 100644
--- a/app/assets/javascripts/members/components/table/max_role.vue
+++ b/app/assets/javascripts/members/components/table/max_role.vue
@@ -134,7 +134,10 @@ export default {
         <div data-testid="access-level-link" :class="{ 'gl-font-weight-bold': item.memberRoleId }">
           {{ item.text }}
         </div>
-        <div v-if="item.description" class="gl-text-gray-700 gl-font-sm gl-pt-1 gl-line-clamp-2">
+        <div
+          v-if="item.description"
+          class="gl-text-gray-700 gl-font-sm gl-pt-1 gl-line-clamp-2 gl-whitespace-normal"
+        >
           {{ item.description }}
         </div>
       </template>
diff --git a/app/assets/javascripts/repository/components/commit_info.vue b/app/assets/javascripts/repository/components/commit_info.vue
index b338b5a868f6f806a8f7a57ab887b4a08d4ca8ab..8fe7cafadcabe7d136474a2dcbb7f8fc3cfaf3d2 100644
--- a/app/assets/javascripts/repository/components/commit_info.vue
+++ b/app/assets/javascripts/repository/components/commit_info.vue
@@ -94,7 +94,7 @@ export default {
             v-safe-html:[$options.safeHtmlConfig]="commit.titleHtml"
             :href="commit.webPath"
             :class="{ 'gl-italic': !commit.message }"
-            class="commit-row-message item-title gl-line-clamp-1 !gl-break-all"
+            class="commit-row-message item-title gl-line-clamp-1 gl-whitespace-normal !gl-break-all"
           />
           <gl-button
             v-if="commit.descriptionHtml"
diff --git a/app/assets/stylesheets/page_bundles/projects.scss b/app/assets/stylesheets/page_bundles/projects.scss
index e268561f36a76b9589c4ac86e9c56548344ad9b0..4f9746b599d119c3a62731805b4b07bf88ec187b 100644
--- a/app/assets/stylesheets/page_bundles/projects.scss
+++ b/app/assets/stylesheets/page_bundles/projects.scss
@@ -559,6 +559,6 @@
 }
 
 .projects-list .description p {
-  @include gl-line-clamp-2;
+  @apply gl-line-clamp-2 gl-whitespace-normal;
   margin-bottom: 0;
 }
diff --git a/config/tailwind.config.js b/config/tailwind.config.js
index e3a7e6b03670ee7f6e48b915f2b7ca0abf0019f9..49a621b43908903e3b96ac13e46c61543880c140 100644
--- a/config/tailwind.config.js
+++ b/config/tailwind.config.js
@@ -65,10 +65,6 @@ module.exports = {
      */
     backgroundImage: false,
     /*
-    Our lineClamp also sets white-space: normal, which tailwind doesn't do, maybe we are okay?
-     */
-    lineClamp: false,
-    /*
     outline-none in tailwind is 2px solid transparent, we have outline: none
 
     I assume that tailwind has it's reasons, and we probably could enable it
diff --git a/scripts/frontend/lib/tailwind_migration.mjs b/scripts/frontend/lib/tailwind_migration.mjs
index b6ac5a68778d3f61030af5125cef82b7dd4ef5a9..9e97130e6bdda3e00894c92a36daa17cd97200d8 100644
--- a/scripts/frontend/lib/tailwind_migration.mjs
+++ b/scripts/frontend/lib/tailwind_migration.mjs
@@ -46,6 +46,13 @@ export const mismatchAllowList = [
   '.border-l\\!',
   '.border-r\\!',
   '.border-t\\!',
+   // Tailwind's line-clamp utils don't set `white-space: normal`, while our custom utils did.
+   // We have added `gl-whitespace-normal` wherever line-clamp utils were being used, so these
+   // mismatches can be ignored.
+   '.line-clamp-1',
+   '.line-clamp-2',
+   '.line-clamp-3',
+   
 ];
 
 export function loadCSSFromFile(filePath) {