diff --git a/client/text_query.py b/client/text_query.py
index f46655728..a0ef12b68 100644
--- a/client/text_query.py
+++ b/client/text_query.py
@@ -84,7 +84,9 @@ def query(options):
             return 1
         from entropy.client.interfaces import Client
         etp_client = Client()
-        acquired = entropy.tools.acquire_entropy_locks(etp_client, shared=True)
+        # do not taint stdout, use blocking mode
+        acquired = entropy.tools.acquire_entropy_locks(etp_client, shared=True,
+                                                       blocking=True)
         if not acquired:
             print_error(darkgreen(_("Another Entropy is currently running.")))
             return 1
diff --git a/client/text_ugc.py b/client/text_ugc.py
index 33a6fcb3a..5880024de 100644
--- a/client/text_ugc.py
+++ b/client/text_ugc.py
@@ -53,8 +53,9 @@ def ugc(options):
             print_error(darkgreen(_("You are not in the entropy group.")))
             return 1
         entropy_client = Client()
+        # do not taint stdout, use blocking mode
         acquired = entropy.tools.acquire_entropy_locks(
-            entropy_client, shared=True)
+            entropy_client, shared=True, blocking=True)
         if not acquired:
             print_error(darkgreen(_("Another Entropy is currently running.")))
             return 1