diff --git a/templates/main.php b/templates/main.php
index f86eb1359..a22fe8132 100644
--- a/templates/main.php
+++ b/templates/main.php
@@ -36,8 +36,24 @@ Util::addScript('deck', 'vendor/angular-ui-select/dist/select.min');
 Util::addScript('deck', 'vendor/markdown-it/dist/markdown-it.min');
 Util::addScript('deck', 'vendor/angular-markdown-it/dist/ng-markdownit.min');
 Util::addScript('deck', 'vendor/markdown-it-link-target/dist/markdown-it-link-target.min');
-Util::addScript('deck', 'public/app');
 
+if(!\OC::$server->getConfig()->getSystemValue('debug', false)) {
+	Util::addScript('deck', 'public/app');
+} else {
+	// Load seperate JS files when debug mode is enabled
+	$js = [
+		'app' => ['App', 'Config', 'Run'],
+		'controller' => ['AppController', 'BoardController', 'CardController', 'ListController'],
+		'directive' => ['appnavigationentryutils', 'appPopoverMenuUtils', 'autofocusoninsert', 'avatar', 'elastic', 'search'],
+		'filters' => ['cardFilter', 'cardSearchFilter', 'iconWhiteFilter', 'lightenColorFilter', 'orderObjectBy', 'relativeDateFilter', 'textColorFilter'],
+		'service' => ['ApiService', 'BoardService', 'CardService', 'LabelService', 'StackService', 'StatusService'],
+	];
+	foreach($js as $folder=>$files) {
+		foreach ($files as $file) {
+			Util::addScript('deck', $folder.'/'.$file);
+		}
+	}
+}
 ?>
 
 <div id="app" class="app-deck" data-ng-app="Deck" ng-controller="AppController" ng-cloak>