diff --git a/Gutenberg/cocoapods_helpers.rb b/Gutenberg/cocoapods_helpers.rb
index 34a1f8695d15..3a038b2e7030 100644
--- a/Gutenberg/cocoapods_helpers.rb
+++ b/Gutenberg/cocoapods_helpers.rb
@@ -127,6 +127,8 @@ def gutenberg_post_install(installer:)
 end
 
 def gutenberg_post_integrate
+  return unless should_use_local_gutenberg
+
   # If the this workaround runs in the post_install step, the changes it makes get overridden somehow.
   workaround_broken_search_paths
 end
diff --git a/Podfile b/Podfile
index 862dcd28699a..1522146f08a0 100644
--- a/Podfile
+++ b/Podfile
@@ -413,5 +413,5 @@ post_install do |installer|
 end
 
 post_integrate do
-  workaround_broken_search_paths
+  gutenberg_post_integrate
 end
diff --git a/Podfile.lock b/Podfile.lock
index a7f9b21455c1..5aba60038ed7 100644
--- a/Podfile.lock
+++ b/Podfile.lock
@@ -236,6 +236,6 @@ SPEC CHECKSUMS:
   ZendeskSupportSDK: 3a8e508ab1d9dd22dc038df6c694466414e037ba
   ZIPFoundation: d170fa8e270b2a32bef9dcdcabff5b8f1a5deced
 
-PODFILE CHECKSUM: ee1715def28fcb8b610a3720653c5dcdef24fa5d
+PODFILE CHECKSUM: 8f21b7aab84e57d7e16119c89573229552c8c418
 
 COCOAPODS: 1.14.2