                 let creation = creations?.first
                 else
             {
-                let error = error ?? APIClientError(status: APIClientError.InvalidResponseDataStatus, code: APIClientError.InvalidResponseDataCode, title: nil, source: nil,
-                                                    detail: "Missing creation in response for Refresh Creation")
+                let error = error ?? APIClientError(status: APIClientError.InvalidResponseDataStatus, code: APIClientError.InvalidResponseDataCode,
+                                                    title: nil, source: nil, detail: "Missing creation in response for Refresh Creation")
                 completion(error)
                 return
             }
             strongSelf.creation = creation
-            if creation.imageOriginalUrl != nil, shouldUpdateStatus
+            if creation.imageOriginalUrl != nil,
+               (strongSelf.state == .submittedToGallery || strongSelf.state == .serverNotified)
             {
                 strongSelf.state = .confirmedOnServer
             }

                                            weakSelf.state = .completed
                                            weakSelf.delegate?.creationUploadSessionChangedState(weakSelf)
                                        }
                                        completion?(weakSelf.creation, ErrorTransformer.errorFromResponse(nil, error: error))
                                    })
                                })

        currentRequest = submitter.submit()
    }
    
    private func refreshCreationStatus(error: Error?,completion: @escaping (Error?) -> Void)
    {
        if let error = error
        {
