diff --git a/package.json b/package.json
index 49effd9beabf2254f2e57849cb471e7627cdab5d..8b6be0cc5d9c8d3a06cb056eb8f54f2a8676bc08 100644
--- a/package.json
+++ b/package.json
@@ -1,11 +1,9 @@
 {
   "name": "kszkepzes-frontend",
-  "version": "0.2.7",
+  "version": "0.2.8",
   "private": false,
-  "proxy": "http://127.0.0.1:8000/",
   "dependencies": {
     "axios": "^0.19.2",
-    "http-proxy-middleware": "^0.20.0",
     "eslint-plugin-flowtype": "^4.6.0",
     "moment": "^2.24.0",
     "npm": "^6.13.7",
diff --git a/src/components/forms/AddSolutionForm.js b/src/components/forms/AddSolutionForm.js
index 014a2cf72b266129a73677b8889d079261387c44..b179dd942e75af04d618973589973ec800b714e8 100644
--- a/src/components/forms/AddSolutionForm.js
+++ b/src/components/forms/AddSolutionForm.js
@@ -25,7 +25,7 @@ class AddSolutionForm extends Component {
     super(props);
     this.state = {
       showModal: false,
-      uploadState: true,
+      loading: false,
     };
   }
 
@@ -179,28 +179,30 @@ class AddSolutionForm extends Component {
                   >
                     <Icon name='checkmark' /> 
                     BeadĂĄs 
-                    {this.state.uploadState? 
-                      null
-                    :
-                    <Dimmer active>
-                      <Loader size='massive'/>
-                    </Dimmer>}
+                    {this.state.loading? 
+                      <Dimmer active>
+                        <Loader size='massive'/>
+                      </Dimmer>
+                    : null }
                   </Button>
                 }
                 text='beadod az új megoldást, ami felülírja az előzőt'
                 onAccept={() => {
                   this.setState({
-                    uploadState: false
+                    loading: true
                   })
                   this.props.addSolution({
                     task, accepted, corrected, note, name, description, file,
                     }).then( (response)=> {
                       this.setState({
-                        uploadState: true,
+                        loading: false,
                         showModal: false
                       })
                       this.props.clearWrite();
                     }, (response)=> {
+                      this.setState({
+                        loading: false,
+                      })
                       alert('Sikertelen feltĂśltĂŠs!')
                     });
                   }
diff --git a/src/setupProxy.js b/src/setupProxy.js
deleted file mode 100644
index 1ffb50a03ddbabb9b3c6a36aa26a426aaa3b004f..0000000000000000000000000000000000000000
--- a/src/setupProxy.js
+++ /dev/null
@@ -1,7 +0,0 @@
-const proxy = require('http-proxy-middleware');
-
-module.exports = function(app) {
-  app.use(proxy('/api', { target: 'http://127.0.0.1:8000/' }))
-  app.use(proxy('/media', { target: 'http://127.0.0.1:8000/' }))
-  app.use(proxy('/admin', { target: 'http://127.0.0.1:8000/' }))
-};
\ No newline at end of file