diff --git a/platform/ds/arm9/source/nifi.cpp b/platform/ds/arm9/source/nifi.cpp
index 984020c0..e6c8bc06 100644
--- a/platform/ds/arm9/source/nifi.cpp
+++ b/platform/ds/arm9/source/nifi.cpp
@@ -560,6 +560,10 @@ int nifiStartLink() {
 
     nifiFrameCounter = -1;
 
+	memset((void*)&receivedInputReady, 0, sizeof(receivedInputReady));
+	memset((void*)&receivedInput, 0, sizeof(receivedInput));
+	memset(oldInputs, 0, sizeof(oldInputs));
+
     mgr_reset();
     if (nifiLinkType == LINK_CABLE) {
         printLog("Start Gb2\n");
@@ -574,12 +578,6 @@ int nifiStartLink() {
         if (nifiLinkType == LINK_CABLE)
             mgr_setInternalClockGb(gameboy);
 
-        // Fill in first few frames of client's input
-        for (int i=0; i<CLIENT_FRAME_LAG; i++) {
-            receivedInputReady[i] = true;
-            receivedInput[i] = 0xff;
-        }
-
         // Set input destinations
         if (nifiLinkType == LINK_SGB) {
             nifiInputDest = &gameboy->controllers[0];
@@ -599,10 +597,6 @@ int nifiStartLink() {
         if (nifiLinkType == LINK_CABLE)
             mgr_setInternalClockGb(gb2);
 
-        // First few frames of input are skipped, so fill them in
-        for (int i=0; i<OLD_INPUTS_BUFFER_SIZE; i++)
-            oldInputs[i] = 0xff;
-
         // Set input destinations
         if (nifiLinkType == LINK_SGB) {
             nifiInputDest = &gameboy->controllers[1];