diff --git a/src/modules/paymentProcessor/PP_Streaming_v1.sol b/src/modules/paymentProcessor/PP_Streaming_v1.sol
index 1e091c66b..e14f297cf 100644
--- a/src/modules/paymentProcessor/PP_Streaming_v1.sol
+++ b/src/modules/paymentProcessor/PP_Streaming_v1.sol
@@ -245,8 +245,9 @@ contract PP_Streaming_v1 is Module_v1, IPP_Streaming_v1 {
     /// @inheritdoc IPaymentProcessor_v1
     function cancelRunningPayments(IERC20PaymentClientBase_v1 client)
         external
-        onlyModule
-        validClient(address(client))
+        // onlyModule
+        // validClient(address(client))
+        onlyOrchestratorAdmin
     {
         _cancelRunningOrders(address(client));
     }
@@ -540,17 +541,29 @@ contract PP_Streaming_v1 is Module_v1, IPP_Streaming_v1 {
         uint streamId;
         for (index; index < streamIdsArrayLength;) {
             streamId = streamIdsArray[index];
-            _claimForSpecificStream(client, paymentReceiver, streamId);
+
+            // -------------------------------------------------------
+            // Note: Temporary Fix to prevent claims of faulty streams
+            // _claimForSpecificStream(client, paymentReceiver, streamId);
+            // -------------------------------------------------------
 
             // If the paymentOrder being removed was already past its duration, then it would have been removed
             // in the earlier _claimForSpecificStream call.
             // Otherwise, we would remove that paymentOrder in the following lines.
-            if (
-                block.timestamp
-                    < endForSpecificStream(client, paymentReceiver, streamId)
-            ) {
-                _afterClaimCleanup(client, paymentReceiver, streamId);
-            }
+            // -------------------------------------------------------
+            // Note: Temporary Fix to prevent claims of faulty streams
+            // if (
+            //     block.timestamp
+            //         < endForSpecificStream(client, paymentReceiver, streamId)
+            // ) {
+            //     _afterClaimCleanup(client, paymentReceiver, streamId);
+            // }
+            // -------------------------------------------------------
+
+            // Note: Temporary Fix to cancel all of the faulty streams
+            // -------------------------------------------------------
+            _afterClaimCleanup(client, paymentReceiver, streamId);
+            // -------------------------------------------------------
 
             unchecked {
                 ++index;