1 files changed, 8 insertions, 1 deletions
diff --git a/openecomp-ui/src/sdc-app/config/Configuration.js b/openecomp-ui/src/sdc-app/config/Configuration.js
index 227e36995b..3d9ab8bf72 100644
--- a/openecomp-ui/src/sdc-app/config/Configuration.js
+++ b/openecomp-ui/src/sdc-app/config/Configuration.js
@@ -50,6 +50,13 @@ const configuration = new Configuration();
 	configuration.set('restATTPrefix', configuration.get('defaultRestATTPrefix'));
 	configuration.set('appContextPath', configuration.get('appContextPath'));
 })(configuration);
-
+(function setDefaultWebsocketConfig(configuration) {
+	let websocketPort = configuration.get('defaultWebsocketPort');
+	if (DEBUG) {
+		websocketPort = configuration.get('defaultDebugWebsocketPort');
+	}
+	configuration.set('websocketPort', websocketPort);
+	configuration.set('websocketPath', configuration.get('defaultWebsocketPath'));
+})(configuration);
 
 export default configuration;