diff --git a/fdbclient/NativeAPI.actor.cpp b/fdbclient/NativeAPI.actor.cpp
index 0b06925c7b..beb0f1fb3d 100644
--- a/fdbclient/NativeAPI.actor.cpp
+++ b/fdbclient/NativeAPI.actor.cpp
@@ -7887,10 +7887,6 @@ ACTOR Future<std::vector<std::pair<UID, StorageWiggleValue>>> readStorageWiggleV
 	                                                                                          IncludeVersion());
 	state Reference<ReadYourWritesTransaction> tr(new ReadYourWritesTransaction(cx));
 	state std::vector<std::pair<UID, StorageWiggleValue>> res;
-
-	if (g_network->isSimulated() && BUGGIFY_WITH_PROB(0.01)) {
-		throw timed_out();
-	}
 	// read the wiggling pairs
 	loop {
 		try {
diff --git a/fdbserver/Status.actor.cpp b/fdbserver/Status.actor.cpp
index fcce1fa5c8..7c705a4055 100644
--- a/fdbserver/Status.actor.cpp
+++ b/fdbserver/Status.actor.cpp
@@ -3105,9 +3105,9 @@ ACTOR Future<StatusReply> clusterGetStatus(
 			if (configuration.get().perpetualStorageWiggleSpeed > 0) {
 				state Future<std::vector<std::pair<UID, StorageWiggleValue>>> primaryWiggleValues;
 				state Future<std::vector<std::pair<UID, StorageWiggleValue>>> remoteWiggleValues;
-				storageWiggler["error"] = "";
-				primaryWiggleValues = timeoutError(readStorageWiggleValues(cx, true, true), 1.0);
-				remoteWiggleValues = timeoutError(readStorageWiggleValues(cx, false, true), 1.0);
+				double timeout = g_network->isSimulated() && BUGGIFY_WITH_PROB(0.01) ? 0.0 : 2.0;
+				primaryWiggleValues = timeoutError(readStorageWiggleValues(cx, true, true), timeout);
+				remoteWiggleValues = timeoutError(readStorageWiggleValues(cx, false, true), timeout);
 				wait(store(
 				         storageWiggler,
 				         storageWigglerStatsFetcher(db->get().distributor, configuration.get(), cx, true, &messages)) &&