diff --git a/src/main/java/net/floodlightcontroller/restserver/RestApiServer.java b/src/main/java/net/floodlightcontroller/restserver/RestApiServer.java
index ee4da533efbc242a276430b7d5c90117217aadbc..ff49bc022e796caa58f43fcd3b024a47234a18f3 100644
--- a/src/main/java/net/floodlightcontroller/restserver/RestApiServer.java
+++ b/src/main/java/net/floodlightcontroller/restserver/RestApiServer.java
@@ -220,15 +220,6 @@ public class RestApiServer implements IFloodlightModule, IRestApiService {
 					}
 				}
 
-				/*CorsService corsService = new CorsService();         
-				corsService.setAllowedOrigins(new HashSet<String>(Arrays.asList("*")));
-				corsService.setAllowedCredentials(true);
-				corsService.setContext(context);
-				corsService.setAllowingAllRequestedHeaders(true);
-				corsService.setEnabled(true);
-
-				this.getServices().add(corsService);*/
-
 				component.getClients().add(Protocol.CLAP);
 				component.getDefaultHost().attach(this);
 				component.start();
diff --git a/src/main/resources/floodlightdefault.properties b/src/main/resources/floodlightdefault.properties
index cddaaf613495e795579904d205fb02b299a29fdb..b4fc22881c1c19c8bf3c382095be045b53116586 100644
--- a/src/main/resources/floodlightdefault.properties
+++ b/src/main/resources/floodlightdefault.properties
@@ -56,5 +56,6 @@ net.floodlightcontroller.restserver.RestApiServer.useHttps=NO
 net.floodlightcontroller.restserver.RestApiServer.useHttp=YES
 net.floodlightcontroller.restserver.RestApiServer.httpsPort=8081
 net.floodlightcontroller.restserver.RestApiServer.httpPort=8080
+net.floodlightcontroller.restserver.RestApiServer.accessControlAllowAllOrigins=FALSE
 net.floodlightcontroller.statistics.StatisticsCollector.enable=FALSE
 net.floodlightcontroller.statistics.StatisticsCollector.collectionIntervalPortStatsSeconds=10
\ No newline at end of file