diff --git a/hoot-core/src/main/cpp/hoot/core/io/OsmApiWriter.cpp b/hoot-core/src/main/cpp/hoot/core/io/OsmApiWriter.cpp
index 9eebbb1faf..9a06144a74 100644
--- a/hoot-core/src/main/cpp/hoot/core/io/OsmApiWriter.cpp
+++ b/hoot-core/src/main/cpp/hoot/core/io/OsmApiWriter.cpp
@@ -170,7 +170,8 @@ bool OsmApiWriter::apply()
     if (_allThreadsFailed())
     {
       _changeset.failRemainingChangeset();
-      continue;
+      _threadsCanExit = true;
+      break;
     }
     //  Only queue up enough work to keep all the threads busy with times QUEUE_SIZE_MULTIPLIER
     //  so that results can come back and update the changeset for more atomic changesets instead
@@ -196,7 +197,7 @@ bool OsmApiWriter::apply()
         //  all of the threads are idle and not waiting for something to come back
         //  There are two things that can be done here, first is to put everything that is
         //  "ready to send" in a changeset and send it OR move everything to the error state
-
+/*
         //  Option #1: Get all of the remaining elements as a single changeset
         _changesetMutex.lock();
         _changeset.calculateRemainingChangeset(changeset_info);
@@ -205,6 +206,15 @@ bool OsmApiWriter::apply()
         _pushChangesets(changeset_info);
         //  Let the threads know that the remaining changeset is the "remaining" changeset
         _threadsCanExit = true;
+*/
+        LOG_STATUS("Apply Changeset: Remaining elements unsendable...");
+        //  Option #2: Move everything to the error state and exit
+        _changesetMutex.lock();
+        _changeset.failRemainingChangeset();
+        _changesetMutex.unlock();
+        //  Let the threads know that the remaining changeset has failed
+        _threadsCanExit = true;
+        break;
       }
       else
       {
@@ -352,16 +362,6 @@ void OsmApiWriter::_changesetThreadFunc(int index)
         _changesetMutex.unlock();
         //  Update the size of the current changeset that is open
         changesetSize += workInfo->size();
-        //  Remove the "remaining" file if the remaining was successful
-        if (workInfo->getLast())
-        {
-          _changeset.updateRemainingChangeset();
-          //  Let the threads know that the remaining changeset is the "remaining" changeset
-          _threadsCanExit = true;
-          //  Looping should end the thread because all of the remaining elements have now been sent
-          stop_thread = true;
-          continue;
-        }
         //  When the current changeset is nearing the 50k max (or the specified max), close the changeset
         //  otherwise keep it open and go again
         if (changesetSize > _maxChangesetSize - (int)(_maxPushSize * 1.5))
@@ -474,7 +474,12 @@ void OsmApiWriter::_changesetThreadFunc(int index)
     }
     else
     {
-      if (_changeset.hasElementsToSend() && !_changeset.isDone() && queueSize == 0)
+      if (_threadsCanExit)
+      {
+        stop_thread = true;
+        _updateThreadStatus(index, ThreadStatus::Completed);
+      }
+      else if (!_changeset.isDone() && queueSize == 0)
       {
         //  This is a bad state where the producer thread says all elements are sent and
         //  waits for all threads to join but the changeset isn't "done".
@@ -492,17 +497,6 @@ void OsmApiWriter::_changesetThreadFunc(int index)
           id = -1;
         }
         _threadStatusMutex.unlock();
-        //  In this case there are elements that have been sent and not reported back
-        //  BUT there are no threads that are waiting for them either.  Every thread
-        //  except the "first" worker thread will exit here.  The first worker thread
-        //  will wait for the producer thread to calculate the remaining changeset and
-        //  push in on the queue.  It then loops around and picks up the remaining
-        //  changeset and processes it.
-        if (_threadsAreIdle() && index != 0 && _threadsCanExit)
-        {
-          stop_thread = true;
-          _updateThreadStatus(index, ThreadStatus::Completed);
-        }
       }
       else
       {